qtbase-native: Fix qdbuscpp2xml segfault
PATCH 1/1 qtbase-native: Fix qdbuscpp2xml segfault
0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch alone was causing qdbuscpp2xml to simply segfault on simple invocation
--- recipes-qt/qt5/qtbase-native_git.bb | 1 - ...l.pro-do-not-build-with-bootstrapped-depe.patch | 79 ---------------------- 2 files changed, 80 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch
recipes-qt/qt5/qtbase-native_git.bb +0 -1
@@ -33,7 +33,6 @@ SRC_URI += "\ # common for qtbase-native and nativesdk-qtbase SRC_URI += " \ file://0011-Always-build-uic.patch \ - file://0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch \ " CLEANBROKEN = "1"
recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch deleted +0 -79
79 lines not on this page · raw message
Signature · 1 line
2.13.2
Thanks! This bug has been bothering me for a while now, and the patch fixes the issue for me.
Quoted 109 lines · Khem Raj
0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch alone was causing qdbuscpp2xml to simply segfault on simple invocation
Signed-off-by Khem Raj <[email protected]>Cc Andreas Müller <[email protected]>--- recipes-qt/qt5/qtbase-native_git.bb | 1 - ...l.pro-do-not-build-with-bootstrapped-depe.patch | 79 ---------------------- 2 files changed, 80 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patchrecipes-qt/qt5/qtbase-native_git.bb +0
-1@@ -33,7 +33,6 @@ SRC_URI += "\ # common for qtbase-native and nativesdk-qtbase SRC_URI += " \ file://0011-Always-build-uic.patch \ - file://0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch \ " CLEANBROKEN = "1"recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch deleted +0
-79@@ -1,79 +0,0 @@ -From 86ae0ce931edbe0ac30cfe5f94f681f1d055fdb0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> -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 <[email protected]> ---- - 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 -
Is this meant to be applied only for 5.9 or are you seeing this issue with 5.8 as well?
Quoted 134 lines · Martin Kelly
Thanks! This bug has been bothering me for a while now, and the patch fixes the issue for me.
Quoted 113 lines · Khem Raj
0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch alone was causing
qdbuscpp2xml to simply segfault on simple invocationSigned-off-by Khem Raj <[email protected]>Cc Andreas Müller <[email protected]>--- recipes-qt/qt5/qtbase-native_git.bb | 1 - ...l.pro-do-not-build-with-bootstrapped-depe.patch | 79 ---------------------- 2 files changed, 80 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtbase-native_git.bb +0
-0qtbase-native_git.bb
index da69812..98cbecc 100644recipes-qt/qt5/qtbase-native_git.bb +0
-1@@ -33,7 +33,6 @@ SRC_URI += "\ # common for qtbase-native and nativesdk-qtbase SRC_URI += " \ file://0011-Always-build-uic.patch \ - file://0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch \ "CLEANBROKEN = "1"
recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-w renamed from recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch +0
-0ith-bootstrapped-depe.patch
deleted file mode 100644
index e72601c..0000000
--- a/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-w ith-bootstrapped-depe.patch
+++/dev/nullrecipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-w renamed from recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch +0
-33@@ -1,79 +0,0 @@ -From 86ae0ce931edbe0ac30cfe5f94f681f1d055fdb0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> -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 <[email protected]> ---- - 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_dbusrecipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-w renamed from recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch +0
-4- - src_winmain.subdir = $$PWD/winmain - src_winmain.target = sub-winmain -diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.prob/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-w renamed from recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch +0
-13-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.prob/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-w renamed from recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch +0
-9-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-privaterecipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-w
Quoted 10 lines
recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-w renamed from recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch +0
-9--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 - --_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Quoted 3 lines · Martin Jansa
Is this meant to be applied only for 5.9 or are you seeing this issue with 5.8 as well?
for 5.8, i havent tested 5.9
Quoted 137 lines · Martin Kelly
Quoted 134 lines
Thanks! This bug has been bothering me for a while now, and the patch fixes the issue for me.
Quoted 113 lines · Khem Raj
0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch alone was causing
qdbuscpp2xml to simply segfault on simple invocationSigned-off-by Khem Raj <[email protected]>Cc Andreas Müller <[email protected]>--- recipes-qt/qt5/qtbase-native_git.bb | 1 - ...l.pro-do-not-build-with-bootstrapped-depe.patch | 79 ---------------------- 2 files changed, 80 deletions(-) delete mode 100644
recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patchrecipes-qt/qt5/qtbase-native_git.bb +0
-1@@ -33,7 +33,6 @@ SRC_URI += "\ # common for qtbase-native and nativesdk-qtbase SRC_URI += " \ file://0011-Always-build-uic.patch \ - file://0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch \ "CLEANBROKEN = "1"
diff --gita/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patchb/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patchdeleted file mode 100644
index e72601c..0000000
---a/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch+++/dev/nullrecipes-qt/qt5/qtbase-native_git.bb +0
-33@@ -1,79 +0,0 @@ -From 86ae0ce931edbe0ac30cfe5f94f681f1d055fdb0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> -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 <[email protected]> ---- - 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_dbusrecipes-qt/qt5/qtbase-native_git.bb +0
-4- - src_winmain.subdir = $$PWD/winmain - src_winmain.target = sub-winmain -diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.prob/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
recipes-qt/qt5/qtbase-native_git.bb +0
-13-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.prob/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
recipes-qt/qt5/qtbase-native_git.bb +0
-7-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_bootstraprecipes-qt/qt5/qtbase-native_git.bb
Quoted 10 lines
recipes-qt/qt5/qtbase-native_git.bb +0
-10- 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 ---
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Andreas Müller
Acked-byQuoted 12 lines · Khem Raj
Quoted 3 lines · Martin Jansa
Is this meant to be applied only for 5.9 or are you seeing this issue with 5.8 as well?
for 5.8, i havent tested 5.9
Quoted 5 lines · Martin Kelly
Quoted 4 lines
Thanks! This bug has been bothering me for a while now, and the patch fixes the issue for me.
I think the patch does not cause trouble for Qt <= 5.8 installed on build host. It seems that 5.9 for host is the crashing combination.
As the author of the patch:
* I am aware that removing this patch causes kde balloo build errors for cross 5.8 (current)
* I hope moving cross 5.9 (future hopefully) will fix issues properly
* the patch seems to do the wrong thing: it causes dependencies on build host's libraries
So
Andreas
Quoted 8 lines · Andreas Müller
Quoted 7 lines · Khem Raj
Quoted 3 lines · Martin Jansa
Is this meant to be applied only for 5.9 or are you seeing this issue with 5.8 as well?
for 5.8, i havent tested 5.9
Quoted 8 lines
Quoted 5 lines
Quoted 5 lines · Martin Kelly
Quoted 4 lines
Thanks! This bug has been bothering me for a while now, and the patch fixes the issue for me.
I think the patch does not cause trouble for Qt <= 5.8 installed on build host. It seems that 5.9 for host is the crashing combination.
I don't have 5.9 on my host. Specifically, I started noticing this when I upgraded from Debian Jessie to Debian Stretch. Jessie had Qt 5.3.2 while Stretch has Qt 5.7.1.
Quoted 14 lines
As the author of the patch:
* I am aware that removing this patch causes kde balloo build errors for cross 5.8 (current)
* I hope moving cross 5.9 (future hopefully) will fix issues properly
* the patch seems to do the wrong thing: it causes dependencies on build host's librariesSo
Acked-by Andreas Müller <[email protected]>Andreas
Quoted 7 lines · Khem Raj
Quoted 3 lines · Martin Jansa
Is this meant to be applied only for 5.9 or are you seeing this issue with 5.8 as well?
for 5.8, i havent tested 5.9
Same for me.
Quoted 137 lines
Quoted 137 lines · Martin Kelly
Quoted 134 lines
Thanks! This bug has been bothering me for a while now, and the patch fixes the issue for me.
Quoted 113 lines · Khem Raj
0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch alone was causing
qdbuscpp2xml to simply segfault on simple invocationSigned-off-by Khem Raj <[email protected]>Cc Andreas Müller <[email protected]>--- recipes-qt/qt5/qtbase-native_git.bb | 1 - ...l.pro-do-not-build-with-bootstrapped-depe.patch | 79 ---------------------- 2 files changed, 80 deletions(-) delete mode 100644
recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patchrecipes-qt/qt5/qtbase-native_git.bb +0
-1@@ -33,7 +33,6 @@ SRC_URI += "\ # common for qtbase-native and nativesdk-qtbase SRC_URI += " \ file://0011-Always-build-uic.patch \ - file://0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch \ "CLEANBROKEN = "1"
diff --gita/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patchb/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patchdeleted file mode 100644
index e72601c..0000000
---a/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch+++/dev/nullrecipes-qt/qt5/qtbase-native_git.bb +0
-33@@ -1,79 +0,0 @@ -From 86ae0ce931edbe0ac30cfe5f94f681f1d055fdb0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> -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 <[email protected]> ---- - 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_dbusrecipes-qt/qt5/qtbase-native_git.bb +0
-4- - src_winmain.subdir = $$PWD/winmain - src_winmain.target = sub-winmain -diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.prob/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
recipes-qt/qt5/qtbase-native_git.bb +0
-13-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.prob/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
recipes-qt/qt5/qtbase-native_git.bb +0
-7-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_bootstraprecipes-qt/qt5/qtbase-native_git.bb
Quoted 10 lines
recipes-qt/qt5/qtbase-native_git.bb +0
-10- 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 ---
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel