1 files changed, 25 insertions, 32 deletions

diff --git a/src/src.pro b/src/src.pro
index 3d185408f8..b13bc4fa43 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,50 +1,47 @@
 TEMPLATE = subdirs
 
-load(qfeatures)
+QT_FOR_CONFIG += gui-private
+include($$OUT_PWD/corelib/qtcore-config.pri)
+include($$OUT_PWD/gui/qtgui-config.pri)
+
+force_bootstrap|!qtConfig(commandlineparser): \
+    CONFIG += force_dbus_bootstrap
 
 src_qtzlib.file = $$PWD/corelib/qtzlib.pro
 src_qtzlib.target = sub-zlib
 
 src_tools_bootstrap.subdir = tools/bootstrap
 src_tools_bootstrap.target = sub-bootstrap
-src_tools_bootstrap.CONFIG = host_build
 
 src_tools_moc.subdir = tools/moc
 src_tools_moc.target = sub-moc
 src_tools_moc.depends = src_tools_bootstrap
-src_tools_moc.CONFIG = host_build
 
 src_tools_rcc.subdir = tools/rcc
 src_tools_rcc.target = sub-rcc
 src_tools_rcc.depends = src_tools_bootstrap
-src_tools_rcc.CONFIG = host_build
 
 src_tools_qlalr.subdir = tools/qlalr
 src_tools_qlalr.target = sub-qlalr
-src_tools_qlalr.CONFIG = host_build
 force_bootstrap: src_tools_qlalr.depends = src_tools_bootstrap
 else: src_tools_qlalr.depends = src_corelib
 
 src_tools_uic.subdir = tools/uic
 src_tools_uic.target = sub-uic
-src_tools_uic.CONFIG = host_build
 force_bootstrap: src_tools_uic.depends = src_tools_bootstrap
 else: src_tools_uic.depends = src_corelib
 
 src_tools_bootstrap_dbus.subdir = tools/bootstrap-dbus
 src_tools_bootstrap_dbus.target = sub-bootstrap_dbus
 src_tools_bootstrap_dbus.depends = src_tools_bootstrap
-src_tools_bootstrap_dbus.CONFIG = host_build
 
 src_tools_qdbusxml2cpp.subdir = tools/qdbusxml2cpp
 src_tools_qdbusxml2cpp.target = sub-qdbusxml2cpp
-src_tools_qdbusxml2cpp.CONFIG = host_build
-force_bootstrap: src_tools_qdbusxml2cpp.depends = src_tools_bootstrap_dbus
+force_dbus_bootstrap: src_tools_qdbusxml2cpp.depends = src_tools_bootstrap_dbus
 else: src_tools_qdbusxml2cpp.depends = src_dbus
 
 src_tools_qdbuscpp2xml.subdir = tools/qdbuscpp2xml
 src_tools_qdbuscpp2xml.target = sub-qdbuscpp2xml
-src_tools_qdbuscpp2xml.CONFIG = host_build
 force_bootstrap: src_tools_qdbuscpp2xml.depends = src_tools_bootstrap_dbus
 else: src_tools_qdbuscpp2xml.depends = src_dbus
 
@@ -63,7 +60,7 @@ src_xml.depends = src_corelib
 src_dbus.subdir = $$PWD/dbus
 src_dbus.target = sub-dbus
 src_dbus.depends = src_corelib
-force_bootstrap: src_dbus.depends += src_tools_bootstrap_dbus  # avoid syncqt race
+force_dbus_bootstrap: src_dbus.depends += src_tools_bootstrap_dbus  # avoid syncqt race
 
 src_concurrent.subdir = $$PWD/concurrent
 src_concurrent.target = sub-concurrent
@@ -132,15 +129,15 @@ src_plugins.depends = src_sql src_xml src_network
 src_android.subdir = $$PWD/android
 
 # this order is important
-contains(QT_CONFIG, zlib)|cross_compile {
+!qtConfig(system-zlib)|cross_compile {
     SUBDIRS += src_qtzlib
-    contains(QT_CONFIG, zlib) {
+    !qtConfig(system-zlib) {
         src_3rdparty_libpng.depends += src_corelib
         src_3rdparty_freetype.depends += src_corelib
     }
 }
 SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc
-!contains(QT_DISABLED_FEATURES, regularexpression):pcre {
+qtConfig(regularexpression):pcre {
     SUBDIRS += src_3rdparty_pcre
     src_corelib.depends += src_3rdparty_pcre
 }
@@ -148,51 +145,47 @@ SUBDIRS += src_corelib src_tools_qlalr
 TOOLS = src_tools_moc src_tools_rcc src_tools_qlalr
 win32:SUBDIRS += src_winmain
 SUBDIRS += src_network src_sql src_xml src_testlib
-contains(QT_CONFIG, dbus) {
-    force_bootstrap|contains(QT_CONFIG, private_tests): \
+qtConfig(dbus) {
+    force_dbus_bootstrap|qtConfig(private_tests): \
         SUBDIRS += src_tools_bootstrap_dbus
     SUBDIRS += src_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
     TOOLS += src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
-    contains(QT_CONFIG, accessibility-atspi-bridge): \
+    qtConfig(accessibility-atspi-bridge): \
         src_platformsupport.depends += src_dbus src_tools_qdbusxml2cpp
     src_plugins.depends += src_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
 }
-contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
-!contains(QT_CONFIG, no-gui) {
-    contains(QT_CONFIG, harfbuzz) {
+qtConfig(concurrent): SUBDIRS += src_concurrent
+qtConfig(gui) {
+    qtConfig(harfbuzz):!qtConfig(system-harfbuzz) {
         SUBDIRS += src_3rdparty_harfbuzzng
         src_gui.depends += src_3rdparty_harfbuzzng
     }
-    win32:contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) {
+    qtConfig(angle) {
         SUBDIRS += src_angle
         src_gui.depends += src_angle
     }
-    contains(QT_CONFIG, png) {
+    qtConfig(png) {
         SUBDIRS += src_3rdparty_libpng
         src_3rdparty_freetype.depends += src_3rdparty_libpng
         src_gui.depends += src_3rdparty_libpng
     }
-    contains(QT_CONFIG, freetype) {
+    qtConfig(freetype):!qtConfig(system-freetype) {
         SUBDIRS += src_3rdparty_freetype
         src_platformsupport.depends += src_3rdparty_freetype
     }
     SUBDIRS += src_gui src_platformsupport src_platformheaders
-    contains(QT_CONFIG, opengl(es2)?):SUBDIRS += src_openglextensions
+    qtConfig(opengl): SUBDIRS += src_openglextensions
     src_plugins.depends += src_gui src_platformsupport src_platformheaders
     src_testlib.depends += src_gui      # if QtGui is enabled, QtTest requires QtGui's headers
-    !contains(QT_CONFIG, no-widgets) {
-        SUBDIRS += src_tools_uic src_widgets
+    qtConfig(widgets) {
+        SUBDIRS += src_tools_uic src_widgets src_printsupport
         TOOLS += src_tools_uic
-        src_plugins.depends += src_widgets
+        src_plugins.depends += src_widgets src_printsupport
         src_testlib.depends += src_widgets        # if QtWidgets is enabled, QtTest requires QtWidgets's headers
-        contains(QT_CONFIG, opengl(es2)?) {
+        qtConfig(opengl) {
             SUBDIRS += src_opengl
             src_plugins.depends += src_opengl
         }
-        !wince:!winrt {
-            SUBDIRS += src_printsupport
-            src_plugins.depends += src_printsupport
-        }
     }
 }
 SUBDIRS += src_plugins