From 86ae0ce931edbe0ac30cfe5f94f681f1d055fdb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 6 Mar 2017 11:50:38 +0100 Subject: [PATCH] qdbuscpp2xml.pro: do not build with bootstrapped dependenciies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream-Status: Pending Signed-off-by: Andreas Müller --- src/src.pro | 9 ++------- src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 3 +-- src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 5 +---- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/src.pro b/src/src.pro index 90d7e2b..0aaf604 100644 --- a/src/src.pro +++ b/src/src.pro @@ -4,9 +4,6 @@ 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 @@ -37,13 +34,11 @@ src_tools_bootstrap_dbus.depends = src_tools_bootstrap src_tools_qdbusxml2cpp.subdir = tools/qdbusxml2cpp src_tools_qdbusxml2cpp.target = sub-qdbusxml2cpp -force_dbus_bootstrap: src_tools_qdbusxml2cpp.depends = src_tools_bootstrap_dbus -else: src_tools_qdbusxml2cpp.depends = src_dbus +src_tools_qdbusxml2cpp.depends = src_dbus src_tools_qdbuscpp2xml.subdir = tools/qdbuscpp2xml src_tools_qdbuscpp2xml.target = sub-qdbuscpp2xml -force_bootstrap: src_tools_qdbuscpp2xml.depends = src_tools_bootstrap_dbus -else: src_tools_qdbuscpp2xml.depends = src_dbus +src_tools_qdbuscpp2xml.depends = src_dbus src_winmain.subdir = $$PWD/winmain src_winmain.target = sub-winmain diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro index 5ac3159..74c507c 100644 --- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro +++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro @@ -1,7 +1,6 @@ option(host_build) QT = core-private -force_bootstrap: QT += bootstrap_dbus-private -else: QT += dbus-private +QT += dbus-private DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro index d9ee5de..e891103 100644 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro @@ -1,9 +1,6 @@ option(host_build) -!force_bootstrap:!qtConfig(commandlineparser): \ - CONFIG += force_bootstrap QT = core-private -force_bootstrap: QT += bootstrap_dbus-private -else: QT += dbus-private +QT += dbus-private DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS -- 2.9.3