diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2022-10-07 11:30:39 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2022-10-07 11:51:14 +0300 |
| commit | cbca58e09285632943dad7bc35072be934032c57 (patch) | |
| tree | 514b91f9338995b1f771b3c0ce2c3d661b63a612 /recipes-qt/qt5 | |
| parent | 8c4e23c1cabacafd0b5afa315abb5b8463d52ffe (diff) | |
| parent | 11ef27b254a574269e0cf860c06d79d518e65bce (diff) | |
Merge remote-tracking branch 'upstream/master' into lts-5.15
Changelog:
11ef27b2 ptest: remove references to destination directory
1ced472c ptest: remove build paths from tests
b20be92d qmake5_base: Remove QMAKE_PRL_BUILD_DIR from prl files
69f3e3c3 layers: Add langdale to LAYERSERIES_COMPAT
Conflicts:
recipes-qt/qt5/qtbase_git.bb
Task-number: QTBUG-107228
Change-Id: Ied573496560d52e38404eb7faf24f2cd749a834a
Diffstat (limited to 'recipes-qt/qt5')
| -rw-r--r-- | recipes-qt/qt5/qt5-ptest.inc | 4 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase/0005-testlib-don-t-track-the-build-or-source-directories.patch | 31 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 1 |
3 files changed, 36 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qt5-ptest.inc b/recipes-qt/qt5/qt5-ptest.inc index c96714a4..75d71ba9 100644 --- a/recipes-qt/qt5/qt5-ptest.inc +++ b/recipes-qt/qt5/qt5-ptest.inc @@ -10,6 +10,10 @@ do_compile_ptest() { oe_runmake } +DEBUG_PREFIX_MAP += "\ + -fmacro-prefix-map=${D}= \ +" + fakeroot do_install_ptest() { mkdir -p ${D}${PTEST_PATH} t=${D}${PTEST_PATH} diff --git a/recipes-qt/qt5/qtbase/0005-testlib-don-t-track-the-build-or-source-directories.patch b/recipes-qt/qt5/qtbase/0005-testlib-don-t-track-the-build-or-source-directories.patch new file mode 100644 index 00000000..d6715460 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0005-testlib-don-t-track-the-build-or-source-directories.patch @@ -0,0 +1,31 @@ +From 8b2ff0bb21fa447d4383aa5c749f3dcec52fe525 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo <samuli.piippo@qt.io> +Date: Mon, 22 Aug 2022 15:01:28 +0300 +Subject: [PATCH] testlib: don't track the build or source directories + +Build tests without location of the build and sources directories. + +Upstream-Status: Inappropriate [embedded specific] +Change-Id: I8d5add473623a3d9f481097649819c9fb906e4b2 +--- + mkspecs/features/testlib_defines.prf | 2 -- + src/testlib/Qt5TestConfigExtras.cmake.in | 5 ----- + 2 files changed, 7 deletions(-) + +diff --git a/mkspecs/features/testlib_defines.prf b/mkspecs/features/testlib_defines.prf +index 901e03a91d..e69de29bb2 100644 +--- a/mkspecs/features/testlib_defines.prf ++++ b/mkspecs/features/testlib_defines.prf +@@ -1,2 +0,0 @@ +-contains(TEMPLATE, vc.*): DEFINES += QT_TESTCASE_BUILDDIR=\"$$OUT_PWD\" +-else: DEFINES += QT_TESTCASE_BUILDDIR=$$shell_quote(\"$$OUT_PWD\") +diff --git a/src/testlib/Qt5TestConfigExtras.cmake.in b/src/testlib/Qt5TestConfigExtras.cmake.in +index 2a575958ae..e69de29bb2 100644 +--- a/src/testlib/Qt5TestConfigExtras.cmake.in ++++ b/src/testlib/Qt5TestConfigExtras.cmake.in +@@ -1,5 +0,0 @@ +- +-set_property(TARGET Qt5::Test +- APPEND PROPERTY +- INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" +-) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 3246bbb3..dde4849c 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -34,6 +34,7 @@ SRC_URI += "\ file://0017-Define-__NR_futex-if-it-does-not-exist.patch \ file://0018-Revert-Fix-workaround-in-pthread-destructor.patch \ file://0019-tst_QPluginLoader-Simplify-creating-a-fake-pointer-i.patch \ + file://0005-testlib-don-t-track-the-build-or-source-directories.patch \ " # Disable LTO for now, QT5 patches are being worked upstream, perhaps revisit with |