summaryrefslogtreecommitdiffstats
path: root/src/tools/tools.pro
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-03-08 23:43:28 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-18 14:14:42 +0100
commit72367b1679f8176c8f8a2a424a1c9325433dd8cd (patch)
treee5df865b041b1a1841a816a54b6d1664ac7f7431 /src/tools/tools.pro
parent0054505510b6f2bd20eb7648dbbcaa0e0a975d79 (diff)
Bootstrap qdbuscpp2xml.
This involves invoking the Moc classes directly and using the data structures it provides instead of invoking the moc exectutable and parsing the generated code. Change-Id: Ia5c654e8ef58d52d0d3376252c13e13885f80da3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/tools/tools.pro')
-rw-r--r--src/tools/tools.pro5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/tools.pro b/src/tools/tools.pro
index 23666bd4ef..8ad30a998d 100644
--- a/src/tools/tools.pro
+++ b/src/tools/tools.pro
@@ -1,7 +1,7 @@
TEMPLATE = subdirs
TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc
-contains(QT_CONFIG, dbus): TOOLS_SUBDIRS += src_tools_qdbusxml2cpp
+contains(QT_CONFIG, dbus): TOOLS_SUBDIRS += src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
!contains(QT_CONFIG, no-gui): TOOLS_SUBDIRS += src_tools_uic
# Set subdir and respective target name
src_tools_bootstrap.subdir = $$PWD/bootstrap
@@ -17,6 +17,8 @@ src_tools_qdoc.target = sub-qdoc
contains(QT_CONFIG, dbus) {
src_tools_qdbusxml2cpp.subdir = $$QT_SOURCE_TREE/src/tools/qdbusxml2cpp
src_tools_qdbusxml2cpp.target = sub-qdbusxml2cpp
+ src_tools_qdbuscpp2xml.subdir = $$QT_SOURCE_TREE/src/tools/qdbuscpp2xml
+ src_tools_qdbuscpp2xml.target = sub-qdbuscpp2xml
}
!wince*:!ordered {
@@ -27,6 +29,7 @@ contains(QT_CONFIG, dbus) {
src_tools_qdoc.depends = src_tools_bootstrap
contains(QT_CONFIG, dbus) {
src_tools_qdbusxml2cpp.depends = src_tools_bootstrap
+ src_tools_qdbuscpp2xml.depends = src_tools_bootstrap
}
}