Add cmdline feature to qmake

[ChangeLog][qmake] A new feature "cmdline" was added that implies "CONFIG += console" and "CONFIG -= app_bundle". Task-number: QTBUG-27079 Change-Id: I6e52b07c9341c904bb1424fc717057432f9360e1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
2019-02-01 15:16:00 +01:00 · 2019-02-01 15:16:00 +01:00 · 8fe3680193
commit 8fe3680193
parent 0c03316ec9
77 changed files with 106 additions and 161 deletions
--- a/examples/corelib/serialization/cbordump/cbordump.pro
+++ b/examples/corelib/serialization/cbordump/cbordump.pro
@ -2,8 +2,7 @@ QT += core
 QT -= gui

 TARGET = cbordump
-CONFIG += console
-CONFIG -= app_bundle
+CONFIG += cmdline

 TEMPLATE = app

--- a/examples/corelib/serialization/convert/convert.pro
+++ b/examples/corelib/serialization/convert/convert.pro
@ -2,8 +2,7 @@ QT += core
 QT -= gui

 TARGET = convert
-CONFIG += console
-CONFIG -= app_bundle
+CONFIG += cmdline

 TEMPLATE = app

--- a/examples/corelib/serialization/savegame/savegame.pro
+++ b/examples/corelib/serialization/savegame/savegame.pro
@ -2,8 +2,7 @@ QT += core
 QT -= gui

 TARGET = savegame
-CONFIG += console
-CONFIG -= app_bundle
+CONFIG += cmdline

 TEMPLATE = app

--- a/examples/corelib/threads/semaphores/semaphores.pro
+++ b/examples/corelib/threads/semaphores/semaphores.pro
@ -1,8 +1,7 @@
 SOURCES += semaphores.cpp
 QT = core

-CONFIG -= app_bundle
-CONFIG += console
+CONFIG += cmdline

 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/corelib/threads/semaphores
--- a/examples/corelib/threads/waitconditions/waitconditions.pro
+++ b/examples/corelib/threads/waitconditions/waitconditions.pro
@ -1,6 +1,6 @@
 QT = core
-CONFIG -= moc app_bundle
-CONFIG += console
+CONFIG -= moc
+CONFIG += cmdline

 SOURCES += waitconditions.cpp

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

--- a/examples/network/download/download.pro
+++ b/examples/network/download/download.pro
@ -1,6 +1,5 @@
 QT = core network
-CONFIG += console
-CONFIG -= app_bundle
+CONFIG += cmdline

 SOURCES += main.cpp

--- a/examples/network/downloadmanager/downloadmanager.pro
+++ b/examples/network/downloadmanager/downloadmanager.pro
@ -1,6 +1,5 @@
 QT = core network
-CONFIG += console
-CONFIG -= app_bundle
+CONFIG += cmdline

 HEADERS += downloadmanager.h textprogressbar.h
 SOURCES += downloadmanager.cpp main.cpp textprogressbar.cpp
--- a/examples/qmake/precompile/precompile.pro
+++ b/examples/qmake/precompile/precompile.pro
@ -6,8 +6,7 @@
 #! [0]
 TEMPLATE  = app
 LANGUAGE  = C++
-CONFIG	 += console precompile_header
-CONFIG   -= app_bundle
+CONFIG += cmdline precompile_header
 QT += widgets

 # Use Precompiled headers (PCH)
--- a/examples/qtconcurrent/map/map.pro
+++ b/examples/qtconcurrent/map/map.pro
@ -1,8 +1,7 @@
 TEMPLATE = app
 TARGET = mapdemo
 QT += concurrent
-CONFIG += console
-CONFIG -= app_bundle
+CONFIG += cmdline

 SOURCES += main.cpp

--- a/examples/qtconcurrent/runfunction/runfunction.pro
+++ b/examples/qtconcurrent/runfunction/runfunction.pro
@ -1,6 +1,5 @@
 QT += concurrent widgets
-CONFIG += console
-CONFIG -= app_bundle
+CONFIG += cmdline

 SOURCES += main.cpp

--- a/examples/qtconcurrent/wordcount/wordcount.pro
+++ b/examples/qtconcurrent/wordcount/wordcount.pro
@ -1,6 +1,5 @@
 QT += concurrent widgets
-CONFIG += console
-CONFIG -= app_bundle
+CONFIG += cmdline

 SOURCES += main.cpp

--- a/examples/widgets/statemachine/factorial/factorial.pro
+++ b/examples/widgets/statemachine/factorial/factorial.pro
@ -1,6 +1,5 @@
 QT = core
-win32: CONFIG += console
-mac:CONFIG -= app_bundle
+CONFIG += cmdline

 SOURCES += main.cpp

--- a/examples/widgets/statemachine/pingpong/pingpong.pro
+++ b/examples/widgets/statemachine/pingpong/pingpong.pro
@ -1,6 +1,5 @@
 QT = core
-win32: CONFIG += console
-mac:CONFIG -= app_bundle
+CONFIG += cmdline

 SOURCES = main.cpp

--- a/examples/xml/htmlinfo/htmlinfo.pro
+++ b/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
--- a/examples/xml/xmlstreamlint/xmlstreamlint.pro
+++ b/examples/xml/xmlstreamlint/xmlstreamlint.pro
@ -1,5 +1,4 @@
-CONFIG   += console
-CONFIG   -= app_bundle
+CONFIG   += cmdline
 QT       -= gui
 SOURCES  += main.cpp

--- a/mkspecs/features/cmdline.prf
+++ b/mkspecs/features/cmdline.prf
@ -0,0 +1,2 @@
+win32: CONFIG *= console
+macos: CONFIG -= app_bundle
--- a/mkspecs/features/qt_test_helper.prf
+++ b/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 += console
+CONFIG += cmdline

 debug_and_release {
    CONFIG(debug, debug|release) {
--- a/qmake/doc/src/qmake-manual.qdoc
+++ b/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
-        automatically be added to the project.
+        proper include paths, compiler flags and libraries will automatically be
+        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;
@ -4887,8 +4891,7 @@
    \code
    TEMPLATE  = app
    LANGUAGE  = C++
-    CONFIG   += console precompile_header
-    CONFIG   -= app_bundle
+    CONFIG   += cmdline precompile_header

    # Use Precompiled headers (PCH)
    PRECOMPILED_HEADER  = stable.h
--- a/qmake/qmake.pro
+++ b/qmake/qmake.pro
@ -3,8 +3,8 @@
 # and the configures.

 option(host_build)
-CONFIG += console
-CONFIG -= qt app_bundle
+CONFIG += cmdline
+CONFIG -= qt

 DEFINES += \
    PROEVALUATOR_FULL \
--- a/src/tools/moc/util/generate_keywords.pro
+++ b/src/tools/moc/util/generate_keywords.pro
@ -1,4 +1,4 @@
 CONFIG -= moc
-mac:CONFIG -= app_bundle
+CONFIG += cmdline

 SOURCES += generate_keywords.cpp
--- a/tests/auto/corelib/global/qlogging/app/app.pro
+++ b/tests/auto/corelib/global/qlogging/app/app.pro
@ -14,8 +14,7 @@ QT = core

 DESTDIR = ./

-CONFIG -= app_bundle
-CONFIG += console
+CONFIG += cmdline

 SOURCES += main.cpp
 DEFINES += QT_MESSAGELOGCONTEXT
--- a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/qlockfile_test_helper.pro
+++ b/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 -= app_bundle
+CONFIG += cmdline
 QT = core
 DESTDIR = ./
--- a/tests/auto/corelib/io/qprocess/fileWriterProcess/fileWriterProcess.pro
+++ b/tests/auto/corelib/io/qprocess/fileWriterProcess/fileWriterProcess.pro
@ -1,5 +1,4 @@
 SOURCES = main.cpp
-CONFIG += console
-CONFIG -= app_bundle
+CONFIG += cmdline
 QT = core
 DESTDIR = ./
--- a/tests/auto/corelib/io/qprocess/testDetached/testDetached.pro
+++ b/tests/auto/corelib/io/qprocess/testDetached/testDetached.pro
@ -1,6 +1,5 @@
 SOURCES = main.cpp
 QT = core
-CONFIG += console
-CONFIG -= app_bundle
+CONFIG += cmdline
 INSTALLS =
 DESTDIR = ./
--- a/tests/auto/corelib/io/qprocess/testExitCodes/testExitCodes.pro
+++ b/tests/auto/corelib/io/qprocess/testExitCodes/testExitCodes.pro
@ -1,5 +1,5 @@
 SOURCES += main.cpp
-CONFIG -= qt app_bundle
-CONFIG += console
+CONFIG -= qt
+CONFIG += cmdline

 DESTDIR = ./
--- a/tests/auto/corelib/io/qprocess/testForwarding/testForwarding.pro
+++ b/tests/auto/corelib/io/qprocess/testForwarding/testForwarding.pro
@ -1,5 +1,4 @@
 SOURCES = main.cpp
-CONFIG -= app_bundle
-CONFIG += console
+CONFIG += cmdline
 DESTDIR = ./
 QT = core
--- a/tests/auto/corelib/io/qprocess/testForwardingHelper/testForwardingHelper.pro
+++ b/tests/auto/corelib/io/qprocess/testForwardingHelper/testForwardingHelper.pro
@ -1,4 +1,4 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
-CONFIG += console
+CONFIG -= qt
+CONFIG += cmdline
 DESTDIR = ./
--- a/tests/auto/corelib/io/qprocess/testGuiProcess/testGuiProcess.pro
+++ b/tests/auto/corelib/io/qprocess/testGuiProcess/testGuiProcess.pro
@ -1,5 +1,4 @@
 SOURCES += main.cpp
 QT += widgets
-CONFIG += console
-CONFIG -= app_bundle
+CONFIG += cmdline
 DESTDIR = ./
--- a/tests/auto/corelib/io/qprocess/testProcessCrash/testProcessCrash.pro
+++ b/tests/auto/corelib/io/qprocess/testProcessCrash/testProcessCrash.pro
@ -1,5 +1,5 @@
 SOURCES = main.cpp
-CONFIG += console
-CONFIG -= qt app_bundle
+CONFIG += cmdline
+CONFIG -= qt

 DESTDIR = ./
--- a/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/testProcessDeadWhileReading.pro
+++ b/tests/auto/corelib/io/qprocess/testProcessDeadWhileReading/testProcessDeadWhileReading.pro
@ -1,5 +1,5 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
-CONFIG += console
+CONFIG -= qt
+CONFIG += cmdline

 DESTDIR = ./
--- a/tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro
+++ b/tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro
@ -1,6 +1,6 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
-CONFIG += console
+CONFIG -= qt
+CONFIG += cmdline

 win32:!mingw:!equals(TEMPLATE_PREFIX, "vc"):QMAKE_CXXFLAGS += /GS-
 DESTDIR = ./
--- a/tests/auto/corelib/io/qprocess/testProcessEcho/testProcessEcho.pro
+++ b/tests/auto/corelib/io/qprocess/testProcessEcho/testProcessEcho.pro
@ -1,4 +1,4 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
-CONFIG += console
+CONFIG -= qt
+CONFIG += cmdline
 DESTDIR = ./
--- a/tests/auto/corelib/io/qprocess/testProcessEcho2/testProcessEcho2.pro
+++ b/tests/auto/corelib/io/qprocess/testProcessEcho2/testProcessEcho2.pro
@ -1,4 +1,4 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
-CONFIG += console
+CONFIG -= qt
+CONFIG += cmdline
 DESTDIR = ./
--- a/tests/auto/corelib/io/qprocess/testProcessEcho3/testProcessEcho3.pro
+++ b/tests/auto/corelib/io/qprocess/testProcessEcho3/testProcessEcho3.pro
@ -1,4 +1,4 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
-CONFIG += console
+CONFIG -= qt
+CONFIG += cmdline
 DESTDIR = ./
--- a/tests/auto/corelib/io/qprocess/testProcessEnvironment/testProcessEnvironment.pro
+++ b/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
-}
--- a/tests/auto/corelib/io/qprocess/testProcessHang/testProcessHang.pro
+++ b/tests/auto/corelib/io/qprocess/testProcessHang/testProcessHang.pro
@ -1,4 +1,4 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
-CONFIG += console
+CONFIG -= qt
+CONFIG += cmdline
 DESTDIR = ./
--- a/tests/auto/corelib/io/qprocess/testProcessNormal/testProcessNormal.pro
+++ b/tests/auto/corelib/io/qprocess/testProcessNormal/testProcessNormal.pro
@ -1,6 +1,6 @@
 SOURCES = main.cpp
-CONFIG += console
-CONFIG -= qt app_bundle
+CONFIG += cmdline
+CONFIG -= qt

 DESTDIR = ./
 QT = core
--- a/tests/auto/corelib/io/qprocess/testProcessOutput/testProcessOutput.pro
+++ b/tests/auto/corelib/io/qprocess/testProcessOutput/testProcessOutput.pro
@ -1,5 +1,5 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
-CONFIG += console
+CONFIG -= qt
+CONFIG += cmdline
 DESTDIR = ./
 QT = core
--- a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/nospace.pro
+++ b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/nospace.pro
@ -1,6 +1,6 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
-CONFIG += console
+CONFIG -= qt
+CONFIG += cmdline
 DESTDIR = ./
 OBJECTS_DIR = $${OBJECTS_DIR}-nospace
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
--- a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/onespace.pro
+++ b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/onespace.pro
@ -1,6 +1,6 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
-CONFIG += console
+CONFIG -= qt
+CONFIG += cmdline
 DESTDIR = ./
 OBJECTS_DIR = $${OBJECTS_DIR}-onespace

--- a/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/twospaces.pro
+++ b/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/twospaces.pro
@ -1,6 +1,6 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
-CONFIG += console
+CONFIG -= qt
+CONFIG += cmdline
 DESTDIR = ./
 OBJECTS_DIR = $${OBJECTS_DIR}-twospaces

--- a/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/testSetNamedPipeHandleState.pro
+++ b/tests/auto/corelib/io/qprocess/testSetNamedPipeHandleState/testSetNamedPipeHandleState.pro
@ -1,4 +1,4 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
-CONFIG += console
+CONFIG -= qt
+CONFIG += cmdline
 DESTDIR = ./
--- a/tests/auto/corelib/io/qprocess/testSetWorkingDirectory/testSetWorkingDirectory.pro
+++ b/tests/auto/corelib/io/qprocess/testSetWorkingDirectory/testSetWorkingDirectory.pro
@ -1,5 +1,4 @@
 SOURCES = main.cpp
-CONFIG += console
-CONFIG -= app_bundle
+CONFIG += cmdline
 DESTDIR = ./
 QT = core
--- a/tests/auto/corelib/io/qprocess/testSoftExit/testSoftExit.pro
+++ b/tests/auto/corelib/io/qprocess/testSoftExit/testSoftExit.pro
@ -6,7 +6,7 @@ unix {
   SOURCES = main_unix.cpp
 }

-CONFIG -= qt app_bundle
-CONFIG += console
+CONFIG -= qt
+CONFIG += cmdline
 DESTDIR = ./
 QT = core
--- a/tests/auto/corelib/io/qprocess/testSpaceInName/testSpaceInName.pro
+++ b/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
--- a/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/readAllStdinProcess.pro
+++ b/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/readAllStdinProcess.pro
@ -1,7 +1,6 @@
 SOURCES += main.cpp
 QT = core
-CONFIG += console
-CONFIG -= app_bundle
+CONFIG += cmdline
 DESTDIR = ./

 # This app is testdata for tst_qtextstream
--- a/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/readLineStdinProcess.pro
+++ b/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/readLineStdinProcess.pro
@ -1,7 +1,6 @@
 SOURCES += main.cpp
 QT = core
-CONFIG += console
-CONFIG -= app_bundle
+CONFIG += cmdline
 DESTDIR = ./

 # This app is testdata for tst_qtextstream
--- a/tests/auto/corelib/serialization/qtextstream/stdinProcess/stdinProcess.pro
+++ b/tests/auto/corelib/serialization/qtextstream/stdinProcess/stdinProcess.pro
@ -1,7 +1,6 @@
 SOURCES += main.cpp
 QT = core
-CONFIG += console
-CONFIG -= app_bundle
+CONFIG += cmdline
 DESTDIR = ./

 # This app is testdata for tst_qtextstream
--- a/tests/auto/corelib/thread/qthreadstorage/crashonexit/crashonexit.pro
+++ b/tests/auto/corelib/thread/qthreadstorage/crashonexit/crashonexit.pro
@ -9,8 +9,7 @@ debug_and_release {
    TARGET = ../crashOnExit_helper
 }
 QT = core
-CONFIG -= app_bundle
-CONFIG += console
+CONFIG += cmdline

 # This app is testdata for tst_qthreadstorage
 target.path = $$[QT_INSTALL_TESTS]/tst_qthreadstorage/$$TARGET
--- a/tests/auto/corelib/tools/qcommandlineparser/testhelper/qcommandlineparser_test_helper.pro
+++ b/tests/auto/corelib/tools/qcommandlineparser/testhelper/qcommandlineparser_test_helper.pro
@ -1,5 +1,4 @@
-CONFIG += console
-CONFIG -= app_bundle
+CONFIG += cmdline
 QT = core
 DESTDIR = ./

--- a/tests/auto/corelib/tools/qlocale/syslocaleapp/syslocaleapp.pro
+++ b/tests/auto/corelib/tools/qlocale/syslocaleapp/syslocaleapp.pro
@ -1,8 +1,7 @@
 SOURCES += syslocaleapp.cpp
 DESTDIR = ./

-CONFIG += console
-CONFIG -= app_bundle
+CONFIG += cmdline

 QT = core

--- a/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp
+++ b/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"
--- a/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.pro
+++ b/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 += console
+CONFIG += cmdline
 QT = core dbus
--- a/tests/auto/dbus/qdbusmarshall/qpong/qpong.pro
+++ b/tests/auto/dbus/qdbusmarshall/qpong/qpong.pro
@ -2,6 +2,4 @@ SOURCES = qpong.cpp
 TARGET = qpong
 DESTDIR = ./
 QT = core dbus
-CONFIG -= app_bundle
-CONFIG += console
-
+CONFIG += cmdline
--- a/tests/auto/network/access/qnetworkreply/echo/echo.pro
+++ b/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 += console
+CONFIG -= debug_and_release_target
+CONFIG += cmdline
--- a/tests/auto/network/bearer/qnetworksession/lackey/lackey.pro
+++ b/tests/auto/network/bearer/qnetworksession/lackey/lackey.pro
@ -5,5 +5,4 @@ QT = core network

 DESTDIR = ./

-win32:CONFIG += console
-mac:CONFIG -= app_bundle
+CONFIG += cmdline
--- a/tests/auto/network/socket/qlocalsocket/socketprocess/socketprocess.pro
+++ b/tests/auto/network/socket/qlocalsocket/socketprocess/socketprocess.pro
@ -3,7 +3,6 @@ QT = core network testlib
 DESTDIR = ./
 TARGET = socketprocess

-win32:CONFIG += console
-mac:CONFIG -= app_bundle
+CONFIG += cmdline

 SOURCES += main.cpp
--- a/tests/auto/network/socket/qtcpsocket/stressTest/stressTest.pro
+++ b/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 += console
+CONFIG += cmdline
 DESTDIR = ./
 MOC_DIR = .moc/
 TMP_DIR = .tmp/
--- a/tests/auto/network/socket/qudpsocket/clientserver/clientserver.pro
+++ b/tests/auto/network/socket/qudpsocket/clientserver/clientserver.pro
@ -1,6 +1,5 @@
 QT = core network
 SOURCES += main.cpp
-CONFIG += console
-CONFIG -= app_bundle
+CONFIG += cmdline
 TARGET = clientserver
 DESTDIR = ./
--- a/tests/auto/network/socket/qudpsocket/udpServer/udpServer.pro
+++ b/tests/auto/network/socket/qudpsocket/udpServer/udpServer.pro
@ -1,5 +1,3 @@
 SOURCES += main.cpp
 QT = core network
-CONFIG -= app_bundle
-CONFIG += console
-
+CONFIG += cmdline
--- a/tests/auto/other/qprocess_and_guieventloop/write-read-write/write-read-write.pro
+++ b/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 += console
+CONFIG -= qt
+CONFIG += cmdline
 DESTDIR = ./
--- a/tests/baselineserver/src/baselineserver.pro
+++ b/tests/baselineserver/src/baselineserver.pro
@ -5,8 +5,7 @@ QT       += core network

 TARGET = baselineserver
 DESTDIR = ../bin
-CONFIG   += console
-CONFIG   -= app_bundle
+CONFIG += cmdline

 TEMPLATE = app

--- a/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/testProcessLoopback.pro
+++ b/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/testProcessLoopback.pro
@ -1,5 +1,5 @@
 SOURCES = main.cpp
-CONFIG -= qt app_bundle
-CONFIG += console
+CONFIG -= qt
+CONFIG += cmdline
 winrt: QMAKE_LFLAGS += /ENTRY:mainCRTStartup
 DESTDIR = ./
--- a/tests/benchmarks/corelib/tools/qcryptographichash/qcryptographichash.pro
+++ b/tests/benchmarks/corelib/tools/qcryptographichash/qcryptographichash.pro
@ -1,5 +1,5 @@
 TARGET = tst_bench_qcryptographichash
-CONFIG -= debug app_bundle
-CONFIG += release console
+CONFIG -= debug
+CONFIG += release cmdline
 QT = core testlib
 SOURCES += main.cpp
--- a/tests/manual/embeddedintoforeignwindow/embeddedintoforeignwindow.pro
+++ b/tests/manual/embeddedintoforeignwindow/embeddedintoforeignwindow.pro
@ -1,7 +1,6 @@
 TEMPLATE = app
 QT += gui-private
-CONFIG += console c++11
-CONFIG -= app_bundle
+CONFIG += cmdline c++11
 SOURCES += main.cpp itemwindow.cpp
 HEADERS += itemwindow.h
 include(../diaglib/diaglib.pri)
--- a/tests/manual/filetest/filetest.pro
+++ b/tests/manual/filetest/filetest.pro
@ -1,6 +1,5 @@
 TEMPLATE = app
 QT = core
-CONFIG += console
-CONFIG -= app_bundle
+CONFIG += cmdline

 SOURCES += main.cpp
--- a/tests/manual/foreignwindows/foreignwindows.pro
+++ b/tests/manual/foreignwindows/foreignwindows.pro
@ -1,6 +1,5 @@
 TEMPLATE = app
 QT += widgets
-CONFIG += console c++11
-CONFIG -= app_bundle
+CONFIG += cmdline c++11
 SOURCES += main.cpp
 include(../diaglib/diaglib.pri)
--- a/tests/manual/highdpi/highdpi.pro
+++ b/tests/manual/highdpi/highdpi.pro
@ -2,8 +2,7 @@ TEMPLATE = app
 TARGET = highdpi
 INCLUDEPATH += .
 QT += widgets gui-private
-CONFIG +=console
-CONFIG -= app_bundle
+CONFIG += cmdline
 CONFIG += c++11
 # Input
 SOURCES += \
--- a/tests/manual/lance/lance.pro
+++ b/tests/manual/lance/lance.pro
@ -1,6 +1,5 @@
 LANCELOT_DIR = $$PWD/../../auto/other/lancelot
-CONFIG+=console moc
-CONFIG -= app_bundle
+CONFIG += cmdline moc
 TEMPLATE = app
 INCLUDEPATH += . $$LANCELOT_DIR
 QT += core-private gui-private widgets printsupport
--- a/tests/manual/qdesktopservices/qdesktopservices.pro
+++ b/tests/manual/qdesktopservices/qdesktopservices.pro
@ -1,8 +1,7 @@
 QT       += testlib

 TARGET = tst_qdesktopservices
-CONFIG   += console
-CONFIG   -= app_bundle
+CONFIG   += cmdline

 TEMPLATE = app

--- a/tests/manual/qmimedatabase/qmimedatabase.pro
+++ b/tests/manual/qmimedatabase/qmimedatabase.pro
@ -1,5 +1,4 @@
 TEMPLATE = app
 QT = core
-CONFIG += console
-CONFIG -= app_bundle
+CONFIG += cmdline
 SOURCES += main.cpp
--- a/tests/manual/qstorageinfo/qstorageinfo.pro
+++ b/tests/manual/qstorageinfo/qstorageinfo.pro
@ -1,4 +1,3 @@
 QT = core
-CONFIG += console
-CONFIG -= app_bundle
+CONFIG += cmdline
 SOURCES += main.cpp
--- a/tests/manual/qsysinfo/qsysinfo.pro
+++ b/tests/manual/qsysinfo/qsysinfo.pro
@ -1,7 +1,6 @@
 QT       = core
 TARGET   = qsysinfo
 TEMPLATE = app
-CONFIG   += console
-CONFIG   -= app_bundle
+CONFIG   += cmdline

 SOURCES += main.cpp
--- a/tests/manual/widgets/styles/styles.pro
+++ b/tests/manual/widgets/styles/styles.pro
@ -1,7 +1,6 @@
 TEMPLATE = app
 QT = widgets
-CONFIG += console
-CONFIG -= app_bundle
+CONFIG += cmdline
 CONFIG += c++11

 SOURCES += main.cpp
--- a/util/glgen/glgen.pro
+++ b/util/glgen/glgen.pro
@ -1,6 +1,5 @@
 QT       -= gui
-CONFIG   += console
-CONFIG   -= app_bundle
+CONFIG   += cmdline

 # Uncomment following to enable debug output
 #DEFINES += SPECPARSER_DEBUG
--- a/util/gradientgen/tobinaryjson.pro
+++ b/util/gradientgen/tobinaryjson.pro
@ -1,4 +1,3 @@
 SOURCES += tobinaryjson.cpp
 QT = core
-CONFIG += console
-CONFIG -= app_bundle
+CONFIG += cmdline