summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-08-19 15:23:02 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2019-08-20 05:40:46 +0000
commitb5777bd48ee6cfd32d9ae39a7841749298caaadd (patch)
treee2b8a66564aebf924f0da9223f083ffe265a3211
parentf139f2895b699fb0898f6d733b5807c934d48cf1 (diff)
qtscxml: fix test buildHEADdev
Change-Id: Ie11c9d34f7e84e1a17d3a72507e9a3c37ddf664f Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r--recipes-qt/qt5/qtscxml/0001-Fix-shadow-build.patch37
-rw-r--r--recipes-qt/qt5/qtscxml_git.bb5
2 files changed, 41 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtscxml/0001-Fix-shadow-build.patch b/recipes-qt/qt5/qtscxml/0001-Fix-shadow-build.patch
new file mode 100644
index 0000000..96d87b8
--- /dev/null
+++ b/recipes-qt/qt5/qtscxml/0001-Fix-shadow-build.patch
@@ -0,0 +1,37 @@
+From 91547b21cbbdc608a800ad53f47f296798b370ab Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Mon, 19 Aug 2019 15:17:13 +0300
+Subject: [PATCH] Fix shadow build
+
+Don't write to source directory when using shadow build.
+This stops working with Qt 5.14.0.
+
+Change-Id: Ica83b9c810e2a937aab75af131484f5f91570453
+---
+ tests/auto/scion/scion.pro | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/auto/scion/scion.pro b/tests/auto/scion/scion.pro
+index 6e1f7f4..1ebc624 100644
+--- a/tests/auto/scion/scion.pro
++++ b/tests/auto/scion/scion.pro
+@@ -89,15 +89,15 @@ for (f,ALLSCXMLS) {
+ ALLFILES = $$files($$SCXMLS_DIR/*.*, true)
+ for (f,ALLFILES) {
+ base = $$relative_path($$f,$$absolute_path($$SCXMLS_DIR))
+- file = $$relative_path($$f, $$absolute_path($$PWD))
++ file = $$relative_path($$f, $$absolute_path($$OUT_PWD))
+ qrc += '<file alias="$$base">$$file</file>'
+ }
+
+ contents = $$inc_list "std::function<QScxmlStateMachine *()> creators[] = {" $$func_list "};"
+-write_file("scxml/compiled_tests.h", contents)|error("Aborting.")
++write_file("$$OUT_PWD/scxml/compiled_tests.h", contents)|error("Aborting.")
+
+ contents = "const char *testBases[] = {" $$testBases "};"
+-write_file("scxml/scion.h", contents)|error("Aborting.")
++write_file("$$OUT_PWD/scxml/scion.h", contents)|error("Aborting.")
+
+ contents = '<!DOCTYPE RCC><RCC version=\"1.0\">' '<qresource>' $$qrc '</qresource></RCC>'
+-write_file("scion.qrc", contents)|error("Aborting.")
++write_file("$$OUT_PWD/scion.qrc", contents)|error("Aborting.")
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index 8842b9d..2e8b42d 100644
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -14,7 +14,10 @@ SRCREV = "279d63c4f6632237e6a0d9c4be91b466876c260a"
# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12
# 5.12.meta-qt5.2
-SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch"
+SRC_URI += "\
+ file://0001-Use-external-host-bin-path-for-cmake-file.patch \
+ file://0001-Fix-shadow-build.patch \
+"
do_install_append_class-nativesdk() {
# qml files not needed in nativesdk