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

Change-Id: Ifa143cc462301aaa305c9c85360e543553a751f0

16 files changed, 17 insertions, 32 deletions

diff --git a/examples/corelib/serialization/cbordump/cbordump.pro b/examples/corelib/serialization/cbordump/cbordump.pro
index 7fb2ef69f0..8149cb1d4c 100644
--- 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
 
diff --git a/examples/corelib/serialization/convert/convert.pro b/examples/corelib/serialization/convert/convert.pro
index d9b1de41e3..4c6b0b557a 100644
--- 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
 
diff --git a/examples/corelib/serialization/savegame/savegame.pro b/examples/corelib/serialization/savegame/savegame.pro
index 15a38c32ef..69e6b216f2 100644
--- 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
 
diff --git a/examples/corelib/threads/semaphores/semaphores.pro b/examples/corelib/threads/semaphores/semaphores.pro
index 69154e57eb..de909508c4 100644
--- 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
diff --git a/examples/corelib/threads/waitconditions/waitconditions.pro b/examples/corelib/threads/waitconditions/waitconditions.pro
index 2dbe7df68a..19b56a246d 100644
--- 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
 
diff --git a/examples/network/dnslookup/dnslookup.pro b/examples/network/dnslookup/dnslookup.pro
index 0c6b512d3b..c72301420c 100644
--- 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
 
diff --git a/examples/network/download/download.pro b/examples/network/download/download.pro
index 2c784c4197..63d80a0e7c 100644
--- 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
 
diff --git a/examples/network/downloadmanager/downloadmanager.pro b/examples/network/downloadmanager/downloadmanager.pro
index 68972610fa..cd1a977e5d 100644
--- 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
diff --git a/examples/qmake/precompile/precompile.pro b/examples/qmake/precompile/precompile.pro
index 6a23d82c32..27564cd390 100644
--- 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)
diff --git a/examples/qtconcurrent/map/map.pro b/examples/qtconcurrent/map/map.pro
index 166f596909..7f267beb22 100644
--- 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
 
diff --git a/examples/qtconcurrent/runfunction/runfunction.pro b/examples/qtconcurrent/runfunction/runfunction.pro
index 5624c87df7..42c05551ba 100644
--- 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
 
diff --git a/examples/qtconcurrent/wordcount/wordcount.pro b/examples/qtconcurrent/wordcount/wordcount.pro
index 771efadc4a..18545b1a65 100644
--- 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
 
diff --git a/examples/widgets/statemachine/factorial/factorial.pro b/examples/widgets/statemachine/factorial/factorial.pro
index f200c738ba..bf285acf4d 100644
--- 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
 
diff --git a/examples/widgets/statemachine/pingpong/pingpong.pro b/examples/widgets/statemachine/pingpong/pingpong.pro
index 7cc27a13f5..18dee0400d 100644
--- 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
 
diff --git a/examples/xml/htmlinfo/htmlinfo.pro b/examples/xml/htmlinfo/htmlinfo.pro
index e106c69b52..8fea3b38dd 100644
--- 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
diff --git a/examples/xml/xmlstreamlint/xmlstreamlint.pro b/examples/xml/xmlstreamlint/xmlstreamlint.pro
index cf03c4817a..90a6387afe 100644
--- 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