create bootstrap-dbus module

this just factors out the common sources from the qdbus tools, to avoid
double compilation, and to clean up the project files.

Change-Id: I330d108ebffda4bc7c0e0e9ec00e51ddd48d5289
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

4 files changed, 47 insertions, 37 deletions

diff --git a/src/src.pro b/src/src.pro
index 2693a1f44d..fd356f95fc 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -19,13 +19,17 @@ src_tools_qdoc.subdir = tools/qdoc
 src_tools_qdoc.target = sub-qdoc
 src_tools_qdoc.depends = src_tools_bootstrap
 
+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_qdbusxml2cpp.subdir = tools/qdbusxml2cpp
 src_tools_qdbusxml2cpp.target = sub-qdbusxml2cpp
-src_tools_qdbusxml2cpp.depends = src_tools_bootstrap
+src_tools_qdbusxml2cpp.depends = src_tools_bootstrap_dbus
 
 src_tools_qdbuscpp2xml.subdir = tools/qdbuscpp2xml
 src_tools_qdbuscpp2xml.target = sub-qdbuscpp2xml
-src_tools_qdbuscpp2xml.depends = src_tools_bootstrap
+src_tools_qdbuscpp2xml.depends = src_tools_bootstrap_dbus
 
 src_winmain.subdir = $$PWD/winmain
 src_winmain.target = sub-winmain
@@ -97,7 +101,7 @@ SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_corelib
 win32:SUBDIRS += src_winmain
 SUBDIRS += src_network src_sql src_xml src_testlib
 contains(QT_CONFIG, dbus) {
-    SUBDIRS += src_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
+    SUBDIRS += src_dbus src_tools_bootstrap_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
     contains(QT_CONFIG, accessibility-atspi-bridge): \
         src_platformsupport.depends += src_dbus src_tools_qdbusxml2cpp
     src_plugins.depends += src_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
diff --git a/src/tools/bootstrap-dbus/bootstrap-dbus.pro b/src/tools/bootstrap-dbus/bootstrap-dbus.pro
new file mode 100644
index 0000000000..63f7b38a73
--- /dev/null
+++ b/src/tools/bootstrap-dbus/bootstrap-dbus.pro
@@ -0,0 +1,34 @@
+option(host_build)
+
+MODULE = bootstrap_dbus
+TARGET = QtBootstrapDBus
+QT = bootstrap-private
+CONFIG += no_module_headers internal_module
+!build_pass: CONFIG += release
+
+DEFINES += \
+    QT_NO_CAST_FROM_ASCII
+
+MODULE_PRIVATE_INCLUDES = \
+    \$\$QT_MODULE_INCLUDE_BASE/QtDBus \
+    \$\$QT_MODULE_INCLUDE_BASE/QtDBus/$$QT_VERSION \
+    \$\$QT_MODULE_INCLUDE_BASE/QtDBus/$$QT_VERSION/QtDBus
+
+load(qt_module)
+
+QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
+
+SOURCES = \
+    ../../dbus/qdbusintrospection.cpp \
+    ../../dbus/qdbusxmlparser.cpp \
+    ../../dbus/qdbuserror.cpp \
+    ../../dbus/qdbusutil.cpp \
+    ../../dbus/qdbusmisc.cpp \
+    ../../dbus/qdbusmetatype.cpp \
+    ../../dbus/qdbusargument.cpp \
+    ../../dbus/qdbusextratypes.cpp \
+    ../../dbus/qdbus_symbols.cpp \
+    ../../dbus/qdbusunixfiledescriptor.cpp
+
+lib.CONFIG = dummy_install
+INSTALLS = lib
diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
index 8a5635a8c0..96686e7cad 100644
--- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
@@ -1,23 +1,10 @@
 option(host_build)
-
-include(../moc/moc.pri)
-
+QT += bootstrap_dbus-private
 DEFINES += QT_NO_CAST_FROM_ASCII
-
-INCLUDEPATH += $$QT_BUILD_TREE/include \
-                   $$QT_BUILD_TREE/include/QtDBus \
-                   $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION \
-                   $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION/QtDBus
-
 QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
 
-SOURCES += qdbuscpp2xml.cpp \
-          $$QT_SOURCE_TREE/src/dbus/qdbusmetatype.cpp \
-          $$QT_SOURCE_TREE/src/dbus/qdbusutil.cpp \
-          $$QT_SOURCE_TREE/src/dbus/qdbusmisc.cpp \
-          $$QT_SOURCE_TREE/src/dbus/qdbusargument.cpp \
-          $$QT_SOURCE_TREE/src/dbus/qdbusextratypes.cpp \
-          $$QT_SOURCE_TREE/src/dbus/qdbus_symbols.cpp \
-          $$QT_SOURCE_TREE/src/dbus/qdbusunixfiledescriptor.cpp
+include(../moc/moc.pri)
+
+SOURCES += qdbuscpp2xml.cpp
 
 load(qt_tool)
diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
index 5f05df1133..6174cc0c25 100644
--- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
@@ -1,23 +1,8 @@
 option(host_build)
-
+QT += bootstrap_dbus-private
 DEFINES += QT_NO_CAST_FROM_ASCII
-
-INCLUDEPATH += $$QT_BUILD_TREE/include \
-                   $$QT_BUILD_TREE/include/QtDBus \
-                   $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION \
-                   $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION/QtDBus
-
 QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
 
-SOURCES = qdbusxml2cpp.cpp \
-          $$QT_SOURCE_TREE/src/dbus/qdbusintrospection.cpp \
-          $$QT_SOURCE_TREE/src/dbus/qdbusxmlparser.cpp \
-          $$QT_SOURCE_TREE/src/dbus/qdbuserror.cpp \
-          $$QT_SOURCE_TREE/src/dbus/qdbusutil.cpp \
-          $$QT_SOURCE_TREE/src/dbus/qdbusmetatype.cpp \
-          $$QT_SOURCE_TREE/src/dbus/qdbusargument.cpp \
-          $$QT_SOURCE_TREE/src/dbus/qdbusextratypes.cpp \
-          $$QT_SOURCE_TREE/src/dbus/qdbus_symbols.cpp \
-          $$QT_SOURCE_TREE/src/dbus/qdbusunixfiledescriptor.cpp
+SOURCES = qdbusxml2cpp.cpp
 
 load(qt_tool)