Merge branch 'buildsystem'

This appears to be fully backwards-compatible with all tested modules,
as far as CI is concerned.

Change-Id: I53f979d06d0a264c5aab1193bab181a38ab837d6

9 files changed, 20 insertions, 64 deletions

diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri
index f6f8eba82b..5ea10d0e46 100644
--- a/src/tools/bootstrap/bootstrap.pri
+++ b/src/tools/bootstrap/bootstrap.pri
@@ -27,8 +27,8 @@ win32:DEFINES += QT_NODLL
 
 INCLUDEPATH	+= $$QT_BUILD_TREE/include \
                    $$QT_BUILD_TREE/include/QtCore \
-                   $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION \
-                   $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION/QtCore
+                   $$QT_BUILD_TREE/include/QtCore/$$QT_VERSION \
+                   $$QT_BUILD_TREE/include/QtCore/$$QT_VERSION/QtCore
 DEPENDPATH	+= $$INCLUDEPATH \
                    $$QT_SOURCE_TREE/src/corelib/global \
                    $$QT_SOURCE_TREE/src/corelib/kernel \
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 239f9e58b3..afb1448be2 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -1,3 +1,4 @@
+option(host_build)
 TEMPLATE = lib
 TARGET = bootstrap
 CONFIG += staticlib
@@ -30,8 +31,8 @@ win32:DEFINES += QT_NODLL
 
 INCLUDEPATH += $$QT_BUILD_TREE/include \
             $$QT_BUILD_TREE/include/QtCore \
-            $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION \
-            $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION/QtCore
+            $$QT_BUILD_TREE/include/QtCore/$$QT_VERSION \
+            $$QT_BUILD_TREE/include/QtCore/$$QT_VERSION/QtCore
 
 DEPENDPATH += $$INCLUDEPATH \
               ../../corelib/global \
diff --git a/src/tools/moc/moc.pro b/src/tools/moc/moc.pro
index 62d692844f..8b53578e23 100644
--- a/src/tools/moc/moc.pro
+++ b/src/tools/moc/moc.pro
@@ -1,10 +1,11 @@
+option(host_build)
 TEMPLATE	= app
 TARGET		= moc
 
 DEFINES         += QT_MOC QT_NO_CAST_FROM_BYTEARRAY QT_NO_COMPRESS
 DESTDIR         = ../../../bin
-INCLUDEPATH	+= . $$OUT_PWD/../../corelib/global
-DEPENDPATH	+= .
+INCLUDEPATH	+= $$OUT_PWD/../../corelib/global
+DEPENDPATH	+= $$OUT_PWD/../../corelib/global
 LIBS	        =
 OBJECTS_DIR	= .
 
diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
index 33f7937c5b..6dc6699b9b 100644
--- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
@@ -1,4 +1,4 @@
-
+option(host_build)
 TEMPLATE = app
 TARGET = qdbuscpp2xml
 
@@ -6,13 +6,10 @@ DESTDIR = ../../../bin
 
 include(../moc/moc.pri)
 
-INCLUDEPATH += .
-DEPENDPATH += .
-
 INCLUDEPATH += $$QT_BUILD_TREE/include \
                    $$QT_BUILD_TREE/include/QtDBus \
-                   $$QT_BUILD_TREE/include/QtDBus/$$QT.dbus.VERSION \
-                   $$QT_BUILD_TREE/include/QtDBus/$$QT.dbus.VERSION/QtDBus \
+                   $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION \
+                   $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION/QtDBus \
                    $$QT_SOURCE_TREE/src/dbus
 
 QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
index 5c430fdfb1..aebdef50ad 100644
--- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
@@ -1,17 +1,15 @@
+option(host_build)
 TEMPLATE = app
 TARGET = qdbusxml2cpp
 
 DESTDIR = ../../../bin
 
-INCLUDEPATH += .
-DEPENDPATH += .
-
 include(../bootstrap/bootstrap.pri)
 
 INCLUDEPATH += $$QT_BUILD_TREE/include \
                    $$QT_BUILD_TREE/include/QtDBus \
-                   $$QT_BUILD_TREE/include/QtDBus/$$QT.dbus.VERSION \
-                   $$QT_BUILD_TREE/include/QtDBus/$$QT.dbus.VERSION/QtDBus \
+                   $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION \
+                   $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION/QtDBus \
                    $$QT_SOURCE_TREE/src/dbus
 
 QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro
index 348593d74a..9a4796cebe 100644
--- a/src/tools/qdoc/qdoc.pro
+++ b/src/tools/qdoc/qdoc.pro
@@ -1,3 +1,4 @@
+option(host_build)
 TEMPLATE = app
 TARGET = qdoc
 
@@ -11,8 +12,8 @@ DEFINES += QT_NO_TRANSLATION
 INCLUDEPATH += $$QT_SOURCE_TREE/src/tools/qdoc \
                $$QT_SOURCE_TREE/src/tools/qdoc/qmlparser \
                $$QT_BUILD_TREE/include/QtXml \
-               $$QT_BUILD_TREE/include/QtXml/$$QT.xml.VERSION \
-               $$QT_BUILD_TREE/include/QtXml/$$QT.xml.VERSION/QtXml
+               $$QT_BUILD_TREE/include/QtXml/$$QT_VERSION \
+               $$QT_BUILD_TREE/include/QtXml/$$QT_VERSION/QtXml
 
 DEPENDPATH += $$QT_SOURCE_TREE/src/tools/qdoc \
               $$QT_SOURCE_TREE/src/tools/qdoc/qmlparser \
diff --git a/src/tools/rcc/rcc.pro b/src/tools/rcc/rcc.pro
index e87ef605b9..b224f98b61 100644
--- a/src/tools/rcc/rcc.pro
+++ b/src/tools/rcc/rcc.pro
@@ -1,10 +1,9 @@
+option(host_build)
 TEMPLATE = app
 TARGET = rcc
 
 DESTDIR = ../../../bin
 DEFINES += QT_RCC
-INCLUDEPATH += .
-DEPENDPATH += .
 
 include(rcc.pri)
 HEADERS += ../../corelib/kernel/qcorecmdlineargs_p.h
diff --git a/src/tools/tools.pro b/src/tools/tools.pro
index 8ad30a998d..bd8896259a 100644
--- a/src/tools/tools.pro
+++ b/src/tools/tools.pro
@@ -33,44 +33,4 @@ contains(QT_CONFIG, dbus) {
     }
 }
 
-# Special handling, depending on type of project, if it used debug/release or only has one configuration
-EXTRA_DEBUG_TARGETS =
-EXTRA_RELEASE_TARGETS =
-for(subname, TOOLS_SUBDIRS) {
-    subdir = $$subname
-    !isEmpty($${subname}.subdir):subdir = $$eval($${subname}.subdir)
-    subpro = $$subdir/$${basename(subdir)}.pro
-    !exists($$subpro):next()
-    subtarget = $$replace(subdir, [^A-Za-z0-9], _)
-    reg_src = $$replace(QT_SOURCE_TREE, \\\\, \\\\)
-    subdir = $$replace(subdir, $$reg_src, $$QT_BUILD_TREE)
-    subdir = $$replace(subdir, /, $$QMAKE_DIR_SEP)
-    subdir = $$replace(subdir, \\\\, $$QMAKE_DIR_SEP)
-    include($$subpro, SUB)
-    !isEqual(subname, src_tools_bootstrap):if(isEqual(SUB.TEMPLATE, lib) | isEqual(SUB.TEMPLATE, subdirs)):!separate_debug_info {
-        #debug
-        debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS
-        debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug)
-        EXTRA_DEBUG_TARGETS += debug-$${subtarget}
-        QMAKE_EXTRA_TARGETS += debug-$${subtarget}
-        #release
-        release-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS
-        release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) release)
-        EXTRA_RELEASE_TARGETS += release-$${subtarget}
-        QMAKE_EXTRA_TARGETS += release-$${subtarget}
-    } else { #do not have a real debug target/release
-        #debug
-        debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS
-        debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first)
-        EXTRA_DEBUG_TARGETS += debug-$${subtarget}
-        QMAKE_EXTRA_TARGETS += debug-$${subtarget}
-        #release
-        release-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS
-        release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first)
-        EXTRA_RELEASE_TARGETS += release-$${subtarget}
-        QMAKE_EXTRA_TARGETS += release-$${subtarget}
-    }
-}
-
-SUBDIRS = $$TOOLS_SUBDIRS $$SUBDIRS
-isEqual(TARGET,tools): SUBDIRS += $$SRC_SUBDIRS
+SUBDIRS = $$TOOLS_SUBDIRS
diff --git a/src/tools/uic/uic.pro b/src/tools/uic/uic.pro
index 0acc6e77c8..c4b7ca2e19 100644
--- a/src/tools/uic/uic.pro
+++ b/src/tools/uic/uic.pro
@@ -1,10 +1,9 @@
+option(host_build)
 TEMPLATE = app
 TARGET = uic
 
 DESTDIR = ../../../bin
 DEFINES += QT_UIC
-INCLUDEPATH += .
-DEPENDPATH += .
 
 include(uic.pri)
 include(cpp/cpp.pri)