Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: Ifa143cc462301aaa305c9c85360e543553a751f0

examples/corelib/serialization/cbordump/cbordump.pro

@@ -2,8 +2,7 @@ QT += core
 QT -= gui
 
 TARGET = cbordump
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= app_bundle
 
 TEMPLATE = app
 

examples/corelib/serialization/convert/convert.pro

@@ -2,8 +2,7 @@ QT += core
 QT -= gui
 
 TARGET = convert
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= app_bundle
 
 TEMPLATE = app
 

examples/corelib/serialization/savegame/savegame.pro

@@ -2,8 +2,7 @@ QT += core
 QT -= gui
 
 TARGET = savegame
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= app_bundle
 
 TEMPLATE = app
 

examples/corelib/threads/semaphores/semaphores.pro

@@ -1,8 +1,7 @@
 SOURCES += semaphores.cpp
 QT = core
 
-CONFIG -= app_bundle
+CONFIG += cmdline
-CONFIG += console
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/corelib/threads/semaphores

examples/corelib/threads/waitconditions/waitconditions.pro

@@ -1,6 +1,6 @@
 QT = core
-CONFIG -= moc app_bundle
+CONFIG -= moc
-CONFIG += console
+CONFIG += cmdline
 
 SOURCES += waitconditions.cpp
 

examples/network/dnslookup/dnslookup.pro

@@ -1,7 +1,6 @@
 TEMPLATE = app
 QT = core network
-mac:CONFIG -= app_bundle
+CONFIG += cmdline
-win32:CONFIG += console
 HEADERS += dnslookup.h
 SOURCES += dnslookup.cpp
 

examples/network/download/download.pro

@@ -1,6 +1,5 @@
 QT = core network
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= app_bundle
 
 SOURCES += main.cpp
 

examples/network/downloadmanager/downloadmanager.pro

@@ -1,6 +1,5 @@
 QT = core network
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= app_bundle
 
 HEADERS += downloadmanager.h textprogressbar.h
 SOURCES += downloadmanager.cpp main.cpp textprogressbar.cpp

examples/qmake/precompile/precompile.pro

@@ -6,8 +6,7 @@
 #! [0]
 TEMPLATE  = app
 LANGUAGE  = C++
-CONFIG	 += console precompile_header
+CONFIG += cmdline precompile_header
-CONFIG   -= app_bundle
 QT += widgets
 
 # Use Precompiled headers (PCH)

examples/qtconcurrent/map/map.pro

@@ -1,8 +1,7 @@
 TEMPLATE = app
 TARGET = mapdemo
 QT += concurrent
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= app_bundle
 
 SOURCES += main.cpp
 

examples/qtconcurrent/runfunction/runfunction.pro

@@ -1,6 +1,5 @@
 QT += concurrent widgets
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= app_bundle
 
 SOURCES += main.cpp
 

examples/qtconcurrent/wordcount/wordcount.pro

@@ -1,6 +1,5 @@
 QT += concurrent widgets
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= app_bundle
 
 SOURCES += main.cpp
 

examples/widgets/statemachine/factorial/factorial.pro

@@ -1,6 +1,5 @@
 QT = core
-win32: CONFIG += console
+CONFIG += cmdline
-mac:CONFIG -= app_bundle
 
 SOURCES += main.cpp
 

examples/widgets/statemachine/pingpong/pingpong.pro

@@ -1,6 +1,5 @@
 QT = core
-win32: CONFIG += console
+CONFIG += cmdline
-mac:CONFIG -= app_bundle
 
 SOURCES = main.cpp
 

examples/xml/htmlinfo/htmlinfo.pro

@@ -1,10 +1,9 @@
 SOURCES += main.cpp
 QT -= gui
-CONFIG -= app_bundle
 
 RESOURCES   = resources.qrc
 
-win32: CONFIG += console
+CONFIG += cmdline
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/xml/htmlinfo

examples/xml/xmlstreamlint/xmlstreamlint.pro

@@ -1,5 +1,4 @@
-CONFIG   += console
+CONFIG   += cmdline
-CONFIG   -= app_bundle
 QT       -= gui
 SOURCES  += main.cpp
 

mkspecs/common/mac.conf

@@ -17,7 +17,7 @@ QMAKE_EXTENSION_SHLIB   = dylib
 QMAKE_EXTENSIONS_AUX_SHLIB = tbd
 QMAKE_LIBDIR            =
 
-# The proper SDK sysroot will be automatically prepended
+# sdk.prf will prefix the proper SDK sysroot
 QMAKE_INCDIR_OPENGL     = \
     /System/Library/Frameworks/OpenGL.framework/Headers \
     /System/Library/Frameworks/AGL.framework/Headers/

mkspecs/features/cmdline.prf

@@ -0,0 +1,2 @@
+win32: CONFIG *= console
+macos: CONFIG -= app_bundle

mkspecs/features/mac/sdk.prf

@@ -33,6 +33,10 @@ QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path)
 QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath)
 QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion)
 
+sysrootified =
+for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val
+QMAKE_INCDIR_OPENGL = $$sysrootified
+
 QMAKESPEC_NAME = $$basename(QMAKESPEC)
 
 # Resolve SDK version of various tools

mkspecs/features/qt_test_helper.prf

@@ -16,8 +16,7 @@
 # Additionally the helper's executable is suffixed with "_helper" to
 # avoid name clashes with its folder.
 
-CONFIG -= app_bundle
+CONFIG += cmdline
-CONFIG += console
 
 debug_and_release {
     CONFIG(debug, debug|release) {

qmake/doc/src/qmake-manual.qdoc

@@ -1060,8 +1060,12 @@
         proper include paths, compiler flags and libraries will
         automatically be added to the project.
     \row \li console \li The target is a Win32 console application (app only). The
-        proper include paths, compiler flags and libraries will
+        proper include paths, compiler flags and libraries will automatically be
-        automatically be added to the project.
+        added to the project. Consider using the option \c{cmdline} for
+        cross-platform applications.
+    \row \li cmdline \li The target is a cross-platform command line application.
+        On Windows, this implies \c{CONFIG += console}.
+        On macOS, this implies \c{CONFIG -= app_bundle}.
     \row \li shared \li{1,2} The target is a shared object/DLL. The proper
         include paths, compiler flags and libraries will automatically be
         added to the project. Note that \c dll can also be used on all platforms;
@@ -4909,8 +4913,7 @@
     \code
     TEMPLATE  = app
     LANGUAGE  = C++
-    CONFIG   += console precompile_header
+    CONFIG   += cmdline precompile_header
-    CONFIG   -= app_bundle
 
     # Use Precompiled headers (PCH)
     PRECOMPILED_HEADER  = stable.h

qmake/generators/unix/unixmake.cpp

@@ -506,17 +506,14 @@ UnixMakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
                             if (opt.startsWith("-Xarch"))
                                 opt = l.at(++lit); // The user has done the right thing and prefixed each part
                         }
-                        bool found = false;
                         for(int x = 0; x < lflags[arch].size(); ++x) {
                             if (lflags[arch].at(x) == "-framework" && lflags[arch].at(++x) == opt) {
-                                found = true;
+                                lflags[arch].remove(x - 1, 2);
                                 break;
                             }
                         }
-                        if(!found) {
                         lflags[arch].append("-framework");
                         lflags[arch].append(opt);
-                        }
                     } else {
                         lflags[arch].append(opt);
                     }

qmake/qmake.pro

@@ -3,8 +3,8 @@
 # and the configures.
 
 option(host_build)
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= qt app_bundle
+CONFIG -= qt
 
 DEFINES += \
     PROEVALUATOR_FULL \

src/3rdparty/freetype/src/sfnt/pngshim.c

@@ -68,6 +68,7 @@
         ( ( __clang_major__ >= 4 )                               ||       \
         ( ( __clang_major__ == 3 ) && ( __clang_minor__ >= 2 ) ) ) ) ) && \
     defined( __OPTIMIZE__ )                                            && \
+    !defined( __EMSCRIPTEN__ )                                         && \
     __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
 
 #ifdef __clang__

src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm

@@ -353,21 +353,6 @@ QT_USE_NAMESPACE
         [reflectionDelegate applicationDidBecomeActive:notification];
 
     QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationActive);
-/*
-    onApplicationChangedActivation(true);
-
-    if (!QWidget::mouseGrabber()){
-        // Update enter/leave immidiatly, don't wait for a move event. But only
-        // if no grab exists (even if the grab points to this widget, it seems, ref X11)
-        QPoint qlocal, qglobal;
-        QWidget *widgetUnderMouse = 0;
-        qt_mac_getTargetForMouseEvent(0, QEvent::Enter, qlocal, qglobal, 0, &widgetUnderMouse);
-        QApplicationPrivate::dispatchEnterLeave(widgetUnderMouse, 0);
-        qt_last_mouse_receiver = widgetUnderMouse;
-        qt_last_native_mouse_receiver = widgetUnderMouse ?
-            (widgetUnderMouse->internalWinId() ? widgetUnderMouse : widgetUnderMouse->nativeParentWidget()) : 0;
-    }
-*/
 }
 
 - (void)applicationDidResignActive:(NSNotification *)notification
@@ -377,15 +362,6 @@ QT_USE_NAMESPACE
         [reflectionDelegate applicationDidResignActive:notification];
 
     QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationInactive);
-/*
-    onApplicationChangedActivation(false);
-
-    if (!QWidget::mouseGrabber())
-        QApplicationPrivate::dispatchEnterLeave(0, qt_last_mouse_receiver);
-    qt_last_mouse_receiver = 0;
-    qt_last_native_mouse_receiver = 0;
-    qt_button_down = 0;
-*/
 }
 
 - (BOOL)applicationShouldHandleReopen:(NSApplication *)theApplication hasVisibleWindows:(BOOL)flag

src/plugins/platforms/cocoa/qcocoaeventdispatcher.h

@@ -168,10 +168,10 @@ public:
     uint processEventsCalled;
     NSModalSession currentModalSessionCached;
     NSModalSession currentModalSession();
-    void updateChildrenWorksWhenModal();
     void temporarilyStopAllModalSessions();
     void beginModalSession(QWindow *widget);
     void endModalSession(QWindow *widget);
+    bool hasModalSession() const;
     void cleanupModalSessions();
 
     void cancelWaitForMoreEvents();

src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm

@@ -672,43 +672,9 @@ NSModalSession QCocoaEventDispatcherPrivate::currentModalSession()
     return currentModalSessionCached;
 }
 
-static void setChildrenWorksWhenModal(QWindow *window, bool worksWhenModal)
+bool QCocoaEventDispatcherPrivate::hasModalSession() const
 {
-    Q_UNUSED(window)
+    return !cocoaModalSessionStack.isEmpty();
-    Q_UNUSED(worksWhenModal)
-
-    // For NSPanels (but not NSWindows, sadly), we can set the flag
-    // worksWhenModal, so that they are active even when they are not modal.
-/*
-    ### not ported
-    QList<QDialog *> dialogs = window->findChildren<QDialog *>();
-    for (int i=0; i<dialogs.size(); ++i){
-        NSWindow *window = qt_mac_window_for(dialogs[i]);
-        if (window && [window isKindOfClass:[NSPanel class]]) {
-            [static_cast<NSPanel *>(window) setWorksWhenModal:worksWhenModal];
-            if (worksWhenModal && [window isVisible]){
-                [window orderFront:window];
-            }
-        }
-    }
-*/
-}
-
-void QCocoaEventDispatcherPrivate::updateChildrenWorksWhenModal()
-{
-    // Make the dialog children of the window
-    // active. And make the dialog children of
-    // the previous modal dialog unactive again:
-    QMacAutoReleasePool pool;
-    int size = cocoaModalSessionStack.size();
-    if (size > 0){
-        if (QWindow *prevModal = cocoaModalSessionStack[size-1].window)
-            setChildrenWorksWhenModal(prevModal, true);
-        if (size > 1){
-            if (QWindow *prevModal = cocoaModalSessionStack[size-2].window)
-                setChildrenWorksWhenModal(prevModal, false);
-        }
-    }
 }
 
 void QCocoaEventDispatcherPrivate::cleanupModalSessions()
@@ -743,7 +709,6 @@ void QCocoaEventDispatcherPrivate::cleanupModalSessions()
         cocoaModalSessionStack.remove(i);
     }
 
-    updateChildrenWorksWhenModal();
     cleanupModalSessionsNeeded = false;
 }
 
@@ -764,7 +729,6 @@ void QCocoaEventDispatcherPrivate::beginModalSession(QWindow *window)
     // stopped in cleanupModalSessions()).
     QCocoaModalSessionInfo info = {window, nullptr, nullptr};
     cocoaModalSessionStack.push(info);
-    updateChildrenWorksWhenModal();
     currentModalSessionCached = nullptr;
 }
 

src/plugins/platforms/cocoa/qcocoawindow.h

@@ -253,7 +253,6 @@ public: // for QNSView
 
     bool m_needsInvalidateShadow;
 
-    bool m_hasModalSession;
     bool m_frameStrutEventsEnabled;
     QRect m_exposedRect;
     int m_registerTouchCount;

src/plugins/platforms/cocoa/qcocoawindow.mm

@@ -153,7 +153,6 @@ QCocoaWindow::QCocoaWindow(QWindow *win, WId nativeHandle)
     , m_inSetStyleMask(false)
     , m_menubar(nullptr)
     , m_needsInvalidateShadow(false)
-    , m_hasModalSession(false)
     , m_frameStrutEventsEnabled(false)
     , m_registerTouchCount(0)
     , m_resizableTransientParent(false)
@@ -304,13 +303,17 @@ void QCocoaWindow::setVisible(bool visible)
 {
     qCDebug(lcQpaWindow) << "QCocoaWindow::setVisible" << window() << visible;
 
-    m_inSetVisible = true;
+    QScopedValueRollback<bool> rollback(m_inSetVisible, true);
 
     QMacAutoReleasePool pool;
     QCocoaWindow *parentCocoaWindow = nullptr;
     if (window()->transientParent())
         parentCocoaWindow = static_cast<QCocoaWindow *>(window()->transientParent()->handle());
 
+    auto eventDispatcher = [] {
+        return static_cast<QCocoaEventDispatcherPrivate *>(QObjectPrivate::get(qApp->eventDispatcher()));
+    };
+
     if (visible) {
         // We need to recreate if the modality has changed as the style mask will need updating
         recreateWindowIfNeeded();
@@ -351,37 +354,20 @@ void QCocoaWindow::setVisible(bool visible)
             applyWindowState(window()->windowStates());
 
             if (window()->windowState() != Qt::WindowMinimized) {
-                if ((window()->modality() == Qt::WindowModal
+                if (parentCocoaWindow && (window()->modality() == Qt::WindowModal || window()->type() == Qt::Sheet)) {
-                     || window()->type() == Qt::Sheet)
+                    // Show the window as a sheet
-                        && parentCocoaWindow) {
-                    // show the window as a sheet
                     [parentCocoaWindow->nativeWindow() beginSheet:m_view.window completionHandler:nil];
-                } else if (window()->modality() != Qt::NonModal) {
+                } else if (window()->modality() == Qt::ApplicationModal) {
-                    // show the window as application modal
+                    // Show the window as application modal
-                    QCocoaEventDispatcher *cocoaEventDispatcher = qobject_cast<QCocoaEventDispatcher *>(QGuiApplication::instance()->eventDispatcher());
+                    eventDispatcher()->beginModalSession(window());
-                    Q_ASSERT(cocoaEventDispatcher);
+                } else if (m_view.window.canBecomeKeyWindow && !eventDispatcher()->hasModalSession()) {
-                    QCocoaEventDispatcherPrivate *cocoaEventDispatcherPrivate = static_cast<QCocoaEventDispatcherPrivate *>(QObjectPrivate::get(cocoaEventDispatcher));
-                    cocoaEventDispatcherPrivate->beginModalSession(window());
-                    m_hasModalSession = true;
-                } else if ([m_view.window canBecomeKeyWindow]) {
-                    QCocoaEventDispatcher *cocoaEventDispatcher = qobject_cast<QCocoaEventDispatcher *>(QGuiApplication::instance()->eventDispatcher());
-                    QCocoaEventDispatcherPrivate *cocoaEventDispatcherPrivate = nullptr;
-                    if (cocoaEventDispatcher)
-                        cocoaEventDispatcherPrivate = static_cast<QCocoaEventDispatcherPrivate *>(QObjectPrivate::get(cocoaEventDispatcher));
-
-                    if (cocoaEventDispatcherPrivate && cocoaEventDispatcherPrivate->cocoaModalSessionStack.isEmpty())
                     [m_view.window makeKeyAndOrderFront:nil];
-                    else
-                        [m_view.window orderFront:nil];
                 } else {
                     [m_view.window orderFront:nil];
                 }
 
-                // We want the events to properly reach the popup, dialog, and tool
+                // Close popup when clicking outside it
-                if ((window()->type() == Qt::Popup || window()->type() == Qt::Dialog || window()->type() == Qt::Tool)
+                if (window()->type() == Qt::Popup && !(parentCocoaWindow && window()->transientParent()->isActive())) {
-                    && [m_view.window isKindOfClass:[NSPanel class]]) {
-                    ((NSPanel *)m_view.window).worksWhenModal = YES;
-                    if (!(parentCocoaWindow && window()->transientParent()->isActive()) && window()->type() == Qt::Popup) {
                     removeMonitor();
                     NSEventMask eventMask = NSEventMaskLeftMouseDown | NSEventMaskRightMouseDown
                                           | NSEventMaskOtherMouseDown | NSEventMaskMouseMoved;
@@ -396,23 +382,18 @@ void QCocoaWindow::setVisible(bool visible)
                 }
             }
         }
-        }
+
         // In some cases, e.g. QDockWidget, the content view is hidden before moving to its own
         // Cocoa window, and then shown again. Therefore, we test for the view being hidden even
         // if it's attached to an NSWindow.
         if ([m_view isHidden])
             [m_view setHidden:NO];
+
     } else {
-        // qDebug() << "close" << this;
+        // Window not visible, hide it
-        QCocoaEventDispatcher *cocoaEventDispatcher = qobject_cast<QCocoaEventDispatcher *>(QGuiApplication::instance()->eventDispatcher());
-        QCocoaEventDispatcherPrivate *cocoaEventDispatcherPrivate = nullptr;
-        if (cocoaEventDispatcher)
-            cocoaEventDispatcherPrivate = static_cast<QCocoaEventDispatcherPrivate *>(QObjectPrivate::get(cocoaEventDispatcher));
         if (isContentView()) {
-            if (m_hasModalSession) {
+            if (eventDispatcher()->hasModalSession()) {
-                if (cocoaEventDispatcherPrivate)
+                eventDispatcher()->endModalSession(window());
-                    cocoaEventDispatcherPrivate->endModalSession(window());
-                m_hasModalSession = false;
             } else {
                 if ([m_view.window isSheet]) {
                     Q_ASSERT_X(parentCocoaWindow, "QCocoaWindow", "Window modal dialog has no transient parent.");
@@ -422,8 +403,7 @@ void QCocoaWindow::setVisible(bool visible)
 
             [m_view.window orderOut:nil];
 
-            if (m_view.window == [NSApp keyWindow]
+            if (m_view.window == [NSApp keyWindow] && !eventDispatcher()->hasModalSession()) {
-                && !(cocoaEventDispatcherPrivate && cocoaEventDispatcherPrivate->currentModalSession())) {
                 // Probably because we call runModalSession: outside [NSApp run] in QCocoaEventDispatcher
                 // (e.g., when show()-ing a modal QDialog instead of exec()-ing it), it can happen that
                 // the current NSWindow is still key after being ordered out. Then, after checking we
@@ -435,6 +415,7 @@ void QCocoaWindow::setVisible(bool visible)
         } else {
             [m_view setHidden:YES];
         }
+
         removeMonitor();
 
         if (window()->type() == Qt::Popup || window()->type() == Qt::ToolTip)
@@ -448,8 +429,6 @@ void QCocoaWindow::setVisible(bool visible)
                 nativeParentWindow.styleMask |= NSWindowStyleMaskResizable;
         }
     }
-
-    m_inSetVisible = false;
 }
 
 NSInteger QCocoaWindow::windowLevel(Qt::WindowFlags flags)

src/plugins/platforms/cocoa/qnswindow.h

@@ -62,6 +62,7 @@ QT_FORWARD_DECLARE_CLASS(QCocoaWindow)
 @protocol QNSWindowProtocol
 @optional
 - (BOOL)canBecomeKeyWindow;
+- (BOOL)worksWhenModal;
 - (void)sendEvent:(NSEvent*)theEvent;
 - (void)closeAndRelease;
 - (void)dealloc;

src/plugins/platforms/cocoa/qnswindow.mm

@@ -177,6 +177,19 @@ static bool isMouseEvent(NSEvent *ev)
     return canBecomeMain;
 }
 
+- (BOOL)worksWhenModal
+{
+    if ([self isKindOfClass:[QNSPanel class]]) {
+        if (QCocoaWindow *pw = self.platformWindow) {
+            Qt::WindowType type = pw->window()->type();
+            if (type == Qt::Popup || type == Qt::Dialog || type == Qt::Tool)
+                return YES;
+        }
+    }
+
+    return qt_objcDynamicSuper();
+}
+
 - (BOOL)isOpaque
 {
     return self.platformWindow ?

src/tools/moc/util/generate_keywords.pro

@@ -1,4 +1,4 @@
 CONFIG -= moc
-mac:CONFIG -= app_bundle
+CONFIG += cmdline
 
 SOURCES += generate_keywords.cpp

tests/auto/corelib/global/qlogging/app/app.pro

@@ -14,8 +14,7 @@ QT = core
 
 DESTDIR = ./
 
-CONFIG -= app_bundle
+CONFIG += cmdline
-CONFIG += console
 
 SOURCES += main.cpp
 DEFINES += QT_MESSAGELOGCONTEXT

tests/auto/corelib/io/qlockfile/qlockfiletesthelper/qlockfile_test_helper.pro

@@ -1,7 +1,6 @@
 TARGET = qlockfile_test_helper
 SOURCES += qlockfile_test_helper.cpp
 
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= app_bundle
 QT = core
 DESTDIR = ./

tests/auto/corelib/io/qprocess/fileWriterProcess/fileWriterProcess.pro

@@ -1,5 +1,4 @@
 SOURCES = main.cpp
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= app_bundle
 QT = core
 DESTDIR = ./

tests/auto/corelib/io/qprocess/testDetached/testDetached.pro

@@ -1,6 +1,5 @@
 SOURCES = main.cpp
 QT = core
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= app_bundle
 INSTALLS =
 DESTDIR = ./

tests/auto/corelib/io/qprocess/testExitCodes/testExitCodes.pro

@@ -1,5 +1,5 @@
 SOURCES += main.cpp
-CONFIG -= qt app_bundle
+CONFIG -= qt
-CONFIG += console
+CONFIG += cmdline
 
 DESTDIR = ./

tests/auto/corelib/io/qprocess/testForwarding/testForwarding.pro

@@ -1,5 +1,4 @@
 SOURCES = main.cpp
-CONFIG -= app_bundle
+CONFIG += cmdline
-CONFIG += console
 DESTDIR = ./
 QT = core

tests/auto/corelib/io/qprocess/testForwardingHelper/testForwardingHelper.pro

@@ -1,4 +1,4 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
+CONFIG -= qt
-CONFIG += console
+CONFIG += cmdline
 DESTDIR = ./

tests/auto/corelib/io/qprocess/testGuiProcess/testGuiProcess.pro

@@ -1,5 +1,4 @@
 SOURCES += main.cpp
 QT += widgets
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= app_bundle
 DESTDIR = ./

tests/auto/corelib/io/qprocess/testProcessCrash/testProcessCrash.pro

@@ -1,5 +1,5 @@
 SOURCES = main.cpp
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= qt app_bundle
+CONFIG -= qt
 
 DESTDIR = ./

tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/testProcessDeadWhileReading.pro

@@ -1,5 +1,5 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
+CONFIG -= qt
-CONFIG += console
+CONFIG += cmdline
 
 DESTDIR = ./

tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro

@@ -1,6 +1,6 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
+CONFIG -= qt
-CONFIG += console
+CONFIG += cmdline
 
 win32:!mingw:!equals(TEMPLATE_PREFIX, "vc"):QMAKE_CXXFLAGS += /GS-
 DESTDIR = ./

tests/auto/corelib/io/qprocess/testProcessEcho/testProcessEcho.pro

@@ -1,4 +1,4 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
+CONFIG -= qt
-CONFIG += console
+CONFIG += cmdline
 DESTDIR = ./

tests/auto/corelib/io/qprocess/testProcessEcho2/testProcessEcho2.pro

@@ -1,4 +1,4 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
+CONFIG -= qt
-CONFIG += console
+CONFIG += cmdline
 DESTDIR = ./

tests/auto/corelib/io/qprocess/testProcessEcho3/testProcessEcho3.pro

@@ -1,4 +1,4 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
+CONFIG -= qt
-CONFIG += console
+CONFIG += cmdline
 DESTDIR = ./

tests/auto/corelib/io/qprocess/testProcessEnvironment/testProcessEnvironment.pro

@@ -1,8 +1,4 @@
 SOURCES = main.cpp
 CONFIG -= qt
-CONFIG += console
+CONFIG += cmdline
 DESTDIR = ./
-
-mac {
-  CONFIG -= app_bundle
-}

tests/auto/corelib/io/qprocess/testProcessHang/testProcessHang.pro

@@ -1,4 +1,4 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
+CONFIG -= qt
-CONFIG += console
+CONFIG += cmdline
 DESTDIR = ./

tests/auto/corelib/io/qprocess/testProcessNormal/testProcessNormal.pro

@@ -1,6 +1,6 @@
 SOURCES = main.cpp
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= qt app_bundle
+CONFIG -= qt
 
 DESTDIR = ./
 QT = core

tests/auto/corelib/io/qprocess/testProcessOutput/testProcessOutput.pro

@@ -1,5 +1,5 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
+CONFIG -= qt
-CONFIG += console
+CONFIG += cmdline
 DESTDIR = ./
 QT = core

tests/auto/corelib/io/qprocess/testProcessSpacesArgs/nospace.pro

@@ -1,6 +1,6 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
+CONFIG -= qt
-CONFIG += console
+CONFIG += cmdline
 DESTDIR = ./
 OBJECTS_DIR = $${OBJECTS_DIR}-nospace
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

tests/auto/corelib/io/qprocess/testProcessSpacesArgs/onespace.pro

@@ -1,6 +1,6 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
+CONFIG -= qt
-CONFIG += console
+CONFIG += cmdline
 DESTDIR = ./
 OBJECTS_DIR = $${OBJECTS_DIR}-onespace
 

tests/auto/corelib/io/qprocess/testProcessSpacesArgs/twospaces.pro

@@ -1,6 +1,6 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
+CONFIG -= qt
-CONFIG += console
+CONFIG += cmdline
 DESTDIR = ./
 OBJECTS_DIR = $${OBJECTS_DIR}-twospaces
 

tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/testSetNamedPipeHandleState.pro

@@ -1,4 +1,4 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
+CONFIG -= qt
-CONFIG += console
+CONFIG += cmdline
 DESTDIR = ./

tests/auto/corelib/io/qprocess/testSetWorkingDirectory/testSetWorkingDirectory.pro

@@ -1,5 +1,4 @@
 SOURCES = main.cpp
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= app_bundle
 DESTDIR = ./
 QT = core

tests/auto/corelib/io/qprocess/testSoftExit/testSoftExit.pro

@@ -6,7 +6,7 @@ unix {
    SOURCES = main_unix.cpp
 }
 
-CONFIG -= qt app_bundle
+CONFIG -= qt
-CONFIG += console
+CONFIG += cmdline
 DESTDIR = ./
 QT = core

tests/auto/corelib/io/qprocess/testSpaceInName/testSpaceInName.pro

@@ -1,9 +1,5 @@
 SOURCES = main.cpp
 CONFIG -= qt
-CONFIG += console
+CONFIG += cmdline
 DESTDIR = "../test Space In Name"
-
-mac {
-  CONFIG -= app_bundle
-}
 QT = core

tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/readAllStdinProcess.pro

@@ -1,7 +1,6 @@
 SOURCES += main.cpp
 QT = core
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= app_bundle
 DESTDIR = ./
 
 # This app is testdata for tst_qtextstream

tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/readLineStdinProcess.pro

@@ -1,7 +1,6 @@
 SOURCES += main.cpp
 QT = core
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= app_bundle
 DESTDIR = ./
 
 # This app is testdata for tst_qtextstream

tests/auto/corelib/serialization/qtextstream/stdinProcess/stdinProcess.pro

@@ -1,7 +1,6 @@
 SOURCES += main.cpp
 QT = core
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= app_bundle
 DESTDIR = ./
 
 # This app is testdata for tst_qtextstream

tests/auto/corelib/thread/qthreadstorage/crashonexit/crashonexit.pro

@@ -9,8 +9,7 @@ debug_and_release {
     TARGET = ../crashOnExit_helper
 }
 QT = core
-CONFIG -= app_bundle
+CONFIG += cmdline
-CONFIG += console
 
 # This app is testdata for tst_qthreadstorage
 target.path = $$[QT_INSTALL_TESTS]/tst_qthreadstorage/$$TARGET

tests/auto/corelib/tools/qcommandlineparser/testhelper/qcommandlineparser_test_helper.pro

@@ -1,5 +1,4 @@
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= app_bundle
 QT = core
 DESTDIR = ./
 

tests/auto/corelib/tools/qlocale/syslocaleapp/syslocaleapp.pro

@@ -1,8 +1,7 @@
 SOURCES += syslocaleapp.cpp
 DESTDIR = ./
 
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= app_bundle
 
 QT = core
 

tests/auto/corelib/tools/qsharedpointer/externaltests.cpp

@@ -470,9 +470,8 @@ namespace QTest {
             "TEMPLATE = app\n"
             "\n"
             "TARGET   = externaltest\n"
-            "CONFIG   -= app_bundle\n"        // for the Mac
             "CONFIG   -= debug_and_release\n"
-            "CONFIG   += console\n"
+            "CONFIG   += cmdline\n"
             "DESTDIR  = .\n"
             "OBJECTS_DIR = .\n"
             "UI_DIR   = .\n"

tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.pro

@@ -2,6 +2,5 @@ SOURCES = qpinger.cpp ../interface.cpp
 HEADERS = ../interface.h
 TARGET = qpinger
 DESTDIR = ./
-CONFIG -= app_bundle
+CONFIG += cmdline
-CONFIG += console
 QT = core dbus

tests/auto/dbus/qdbusmarshall/qpong/qpong.pro

@@ -2,6 +2,4 @@ SOURCES = qpong.cpp
 TARGET = qpong
 DESTDIR = ./
 QT = core dbus
-CONFIG -= app_bundle
+CONFIG += cmdline
-CONFIG += console
-

tests/auto/gui/qopengl/qopengl.pro

@@ -8,4 +8,4 @@ QT += gui-private core-private testlib
 
 SOURCES   += tst_qopengl.cpp
 
-linux:qtConfig(xcb):qtConfig(xcb-glx):qtConfig(xcb-xlib):!qtConfig(egl): DEFINES += USE_GLX
+linux:qtConfig(xcb):qtConfig(xcb-glx-plugin): DEFINES += USE_GLX

tests/auto/network/access/qnetworkreply/echo/echo.pro

@@ -1,4 +1,4 @@
 SOURCES += main.cpp
 QT = core
-CONFIG -= app_bundle debug_and_release_target
+CONFIG -= debug_and_release_target
-CONFIG += console
+CONFIG += cmdline

tests/auto/network/bearer/qnetworksession/lackey/lackey.pro

@@ -5,5 +5,4 @@ QT = core network
 
 DESTDIR = ./
 
-win32:CONFIG += console
+CONFIG += cmdline
-mac:CONFIG -= app_bundle

tests/auto/network/socket/qlocalsocket/socketprocess/socketprocess.pro

@@ -3,7 +3,6 @@ QT = core network testlib
 DESTDIR = ./
 TARGET = socketprocess
 
-win32:CONFIG += console
+CONFIG += cmdline
-mac:CONFIG -= app_bundle
 
 SOURCES += main.cpp

tests/auto/network/socket/qtcpsocket/stressTest/stressTest.pro

@@ -2,8 +2,7 @@ HEADERS += Test.h
 SOURCES += main.cpp Test.cpp
 QT = core network testlib
 
-CONFIG -= app_bundle
+CONFIG += cmdline
-CONFIG += console
 DESTDIR = ./
 MOC_DIR = .moc/
 TMP_DIR = .tmp/

tests/auto/network/socket/qudpsocket/clientserver/clientserver.pro

@@ -1,6 +1,5 @@
 QT = core network
 SOURCES += main.cpp
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= app_bundle
 TARGET = clientserver
 DESTDIR = ./

tests/auto/network/socket/qudpsocket/udpServer/udpServer.pro

@@ -1,5 +1,3 @@
 SOURCES += main.cpp
 QT = core network
-CONFIG -= app_bundle
+CONFIG += cmdline
-CONFIG += console
-

tests/auto/other/qprocess_and_guieventloop/write-read-write/write-read-write.pro

@@ -1,4 +1,4 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
+CONFIG -= qt
-CONFIG += console
+CONFIG += cmdline
 DESTDIR = ./

tests/baselineserver/src/baselineserver.pro

@@ -5,8 +5,7 @@ QT       += core network
 
 TARGET = baselineserver
 DESTDIR = ../bin
-CONFIG   += console
+CONFIG += cmdline
-CONFIG   -= app_bundle
 
 TEMPLATE = app
 

tests/benchmarks/corelib/io/qprocess/testProcessLoopback/testProcessLoopback.pro

@@ -1,5 +1,5 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
+CONFIG -= qt
-CONFIG += console
+CONFIG += cmdline
 winrt: QMAKE_LFLAGS += /ENTRY:mainCRTStartup
 DESTDIR = ./

tests/benchmarks/corelib/tools/qcryptographichash/qcryptographichash.pro

@@ -1,5 +1,5 @@
 TARGET = tst_bench_qcryptographichash
-CONFIG -= debug app_bundle
+CONFIG -= debug
-CONFIG += release console
+CONFIG += release cmdline
 QT = core testlib
 SOURCES += main.cpp

tests/manual/embeddedintoforeignwindow/embeddedintoforeignwindow.pro

@@ -1,7 +1,6 @@
 TEMPLATE = app
 QT += gui-private
-CONFIG += console c++11
+CONFIG += cmdline c++11
-CONFIG -= app_bundle
 SOURCES += main.cpp itemwindow.cpp
 HEADERS += itemwindow.h
 include(../diaglib/diaglib.pri)

tests/manual/filetest/filetest.pro

@@ -1,6 +1,5 @@
 TEMPLATE = app
 QT = core
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= app_bundle
 
 SOURCES += main.cpp

tests/manual/foreignwindows/foreignwindows.pro

@@ -1,6 +1,5 @@
 TEMPLATE = app
 QT += widgets
-CONFIG += console c++11
+CONFIG += cmdline c++11
-CONFIG -= app_bundle
 SOURCES += main.cpp
 include(../diaglib/diaglib.pri)

tests/manual/highdpi/highdpi.pro

@@ -2,8 +2,7 @@ TEMPLATE = app
 TARGET = highdpi
 INCLUDEPATH += .
 QT += widgets gui-private
-CONFIG +=console
+CONFIG += cmdline
-CONFIG -= app_bundle
 CONFIG += c++11
 # Input
 SOURCES += \

tests/manual/lance/lance.pro

@@ -1,6 +1,5 @@
 LANCELOT_DIR = $$PWD/../../auto/other/lancelot
-CONFIG+=console moc
+CONFIG += cmdline moc
-CONFIG -= app_bundle
 TEMPLATE = app
 INCLUDEPATH += . $$LANCELOT_DIR
 QT += core-private gui-private widgets printsupport

tests/manual/qdesktopservices/qdesktopservices.pro

@@ -1,8 +1,7 @@
 QT       += testlib
 
 TARGET = tst_qdesktopservices
-CONFIG   += console
+CONFIG   += cmdline
-CONFIG   -= app_bundle
 
 TEMPLATE = app
 

tests/manual/qmimedatabase/qmimedatabase.pro

@@ -1,5 +1,4 @@
 TEMPLATE = app
 QT = core
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= app_bundle
 SOURCES += main.cpp

tests/manual/qstorageinfo/qstorageinfo.pro

@@ -1,4 +1,3 @@
 QT = core
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= app_bundle
 SOURCES += main.cpp

tests/manual/qsysinfo/qsysinfo.pro

@@ -1,7 +1,6 @@
 QT       = core
 TARGET   = qsysinfo
 TEMPLATE = app
-CONFIG   += console
+CONFIG   += cmdline
-CONFIG   -= app_bundle
 
 SOURCES += main.cpp

tests/manual/widgets/styles/styles.pro

@@ -1,7 +1,6 @@
 TEMPLATE = app
 QT = widgets
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= app_bundle
 CONFIG += c++11
 
 SOURCES += main.cpp

util/glgen/glgen.pro

@@ -1,6 +1,5 @@
 QT       -= gui
-CONFIG   += console
+CONFIG   += cmdline
-CONFIG   -= app_bundle
 
 # Uncomment following to enable debug output
 #DEFINES += SPECPARSER_DEBUG

util/gradientgen/tobinaryjson.pro

@@ -1,4 +1,3 @@
 SOURCES += tobinaryjson.cpp
 QT = core
-CONFIG += console
+CONFIG += cmdline
-CONFIG -= app_bundle