summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-05-10 12:26:19 +0200
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-05-12 11:40:16 +0000
commit791df9821d1ad05b7bf8a3849b90718dbdffbc5f (patch)
treebb51384f5c9d3260f6df01fe3af07a62bb2d00a4 /src/tools
parent0f0c7e60c406b938a0597854fae7bd7f2568307a (diff)
fix random build error with -no-feature-commandlineparser
when the dbus tools are bootstrapped (which is the case in x-builds and when above feature is disabled), they are built asynchronously to the corelib module. but as qdbusxml2cpp's project file needs to check the need for bootstrapping, it needs corelib's configuration. so pull it in explicitly. Change-Id: I559c7590a3eba8d3f8a03c44fe3a6d56f1c56db0 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/qdbusxml2cpp/qdbusxml2cpp.pro7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
index d9ee5de0be..95fcbcbc50 100644
--- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
@@ -1,6 +1,9 @@
option(host_build)
-!force_bootstrap:!qtConfig(commandlineparser): \
- CONFIG += force_bootstrap
+!force_bootstrap {
+ include($$OUT_PWD/../../corelib/qtcore-config.pri)
+ !qtConfig(commandlineparser): \
+ CONFIG += force_bootstrap
+}
QT = core-private
force_bootstrap: QT += bootstrap_dbus-private
else: QT += dbus-private