blob: 9c5f8fef69719c0bcbd06c9e7e216c9710337d06 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
From 9bd7ad277698be81db2af1a86d5b4efad5818203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
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
Change-Id: I14e9b9a2bb4aca08d408c8aa76a2c58b54e74e7d
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
src/src.pro | 9 ++-------
src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 1 +
src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 1 +
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/src.pro b/src/src.pro
index a2064b1..d6f05e0 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
@@ -41,13 +38,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_tools_qvkgen.subdir = tools/qvkgen
src_tools_qvkgen.target = sub-qvkgen
diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
index 5ac3159..65de97e 100644
--- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
@@ -1,5 +1,6 @@
option(host_build)
QT = core-private
+CONFIG -= force_bootstrap
force_bootstrap: QT += bootstrap_dbus-private
else: QT += dbus-private
DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH
diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
index 95fcbcb..d1ebdde 100644
--- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
@@ -5,6 +5,7 @@ option(host_build)
CONFIG += force_bootstrap
}
QT = core-private
+CONFIG -= force_bootstrap
force_bootstrap: QT += bootstrap_dbus-private
else: QT += dbus-private
DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH
|
