qtbase: add possible fix for random build failure in testsupstream/jansa/warrior-overrides

* might fix
  ld.bfd: cannot find -lmoctestplugin: No such file or directory
  as in:

compiling lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/git/tests/auto/corelib/io/qprocess/testSetWorkingDirectory/main.cpp
linking tst_qresourceengine
moc lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/git/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp
generating .moc/moc_predefs.h
make[5]: Leaving directory 'lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/build/tests/auto/testlib/selftests/multiexec'
compiling lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/git/tests/auto/testlib/selftests/skip/tst_skip.cpp
cd testSoftExit/ && ( test -e Makefile || lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/recipe-sysroot-native/usr/bin/qmake -o Makefile lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/git/tests/auto/corelib/io/qprocess/testSoftExit/testSoftExit.pro -qtconf lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/build/bin/qt.conf ) && make -f Makefile
make[5]: Leaving directory 'lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/build/tests/auto/corelib/thread/qfuturewatcher'
cd verbose2/ && ( test -e Makefile || lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/recipe-sysroot-native/usr/bin/qmake -o Makefile lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/git/tests/auto/testlib/selftests/verbose2/verbose2.pro -qtconf lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/build/bin/qt.conf ) && make -f Makefile
cd verifyexceptionthrown/ && ( test -e Makefile || lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/recipe-sysroot-native/usr/bin/qmake -o Makefile lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/git/tests/auto/testlib/selftests/verifyexceptionthrown/verifyexceptionthrown.pro -qtconf lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/build/bin/qt.conf ) && make -f Makefile
make[5]: Leaving directory 'lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/build/tests/auto/corelib/tools/qlist'
cd warnings/ && ( test -e Makefile || lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/recipe-sysroot-native/usr/bin/qmake -o Makefile lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/git/tests/auto/testlib/selftests/warnings/warnings.pro -qtconf lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/build/bin/qt.conf ) && make -f Makefile
lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/recipe-sysroot-native/usr/bin/arm-oemllib32-linux-gnueabi/../../libexec/arm-oemllib32-linux-gnueabi/gcc/arm-oemllib32-linux-gnueabi/11.4.0/ld.bfd: cannot find -lmoctestplugin: No such file or directory
make[5]: Leaving directory 'lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/build/tests/auto/corelib/tools/qregexp'
cd xunit/ && ( test -e Makefile || lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/recipe-sysroot-native/usr/bin/qmake -o Makefile lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/git/tests/auto/testlib/selftests/xunit/xunit.pro -qtconf lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/build/bin/qt.conf ) && make -f Makefile
make[6]: Leaving directory 'lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/build/tests/auto/corelib/tools/qlocale/test'
make[5]: Leaving directory 'lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/build/tests/auto/corelib/tools/qlocale'
linking testSetWorkingDirectory
cd testProcessSpacesArgs/ && ( test -e Makefile.nospace || lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/recipe-sysroot-native/usr/bin/qmake -o Makefile.nospace lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/git/tests/auto/corelib/io/qprocess/testProcessSpacesArgs/nospace.pro -qtconf lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/build/bin/qt.conf ) && make -f Makefile.nospace
rcc lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/git/tests/auto/gui/image/qiconhighdpi/tst_qiconhighdpi.qrc
collect2: error: ld returned 1 exit status
compiling lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/git/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
make[6]: Leaving directory 'lib32-qtbase/5.12.12+gitAUTOINC+01272c0948-r0/build/tests/auto/corelib/io/qresourceengine'
make[6]: *** [Makefile.qresourceengine_test:109: tst_qresourceengine] Error 1
make[5]: *** [Makefile:70: sub-qresourceengine_test-pro-make_first] Error 2
make[5]: *** Waiting for unfinished jobs....

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>

4 files changed, 29 insertions, 0 deletions

diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index a237f2b2..aa4aa928 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -48,6 +48,7 @@ SRC_URI += "\
     file://0019-zlib-Do-not-undefine-_FILE_OFFSET_BITS.patch \
     file://0020-evdevkeyboard-fix-input_event-time-related-compile.patch \
     file://0021-evdevtouch-fix-input_event-time-related-compile.patch \
+    file://0022-Add-config-ordered-in-tests-qresourceengine-pro.patch \
 "
 
 # common for qtbase-native and nativesdk-qtbase
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index d262dc3a..8c07b85a 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -41,6 +41,7 @@ SRC_URI += "\
     file://0019-zlib-Do-not-undefine-_FILE_OFFSET_BITS.patch \
     file://0020-evdevkeyboard-fix-input_event-time-related-compile.patch \
     file://0021-evdevtouch-fix-input_event-time-related-compile.patch \
+    file://0022-Add-config-ordered-in-tests-qresourceengine-pro.patch \
 "
 
 # common for qtbase-native and nativesdk-qtbase
diff --git a/recipes-qt/qt5/qtbase/0022-Add-config-ordered-in-tests-qresourceengine-pro.patch b/recipes-qt/qt5/qtbase/0022-Add-config-ordered-in-tests-qresourceengine-pro.patch
new file mode 100644
index 00000000..dea4d013
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0022-Add-config-ordered-in-tests-qresourceengine-pro.patch
@@ -0,0 +1,26 @@
+From 4aec28bcedcfe792875a00d261131f08d9640c92 Mon Sep 17 00:00:00 2001
+From: "mark.yang" <mark.yang@lge.com>
+Date: Wed, 27 Sep 2023 11:37:23 +0900
+Subject: [PATCH] Add config ordered in qresourceengine.pro
+
+Add patch to solve build error
+
+QT Parallel build causes errors
+http://gecko.lge.com:8000/Builds/Details/1727813
+
+Resolve by specifying the build order.
+
+Upstream-Status: Pending
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ tests/auto/corelib/io/qresourceengine/qresourceengine.pro | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/auto/corelib/io/qresourceengine/qresourceengine.pro b/tests/auto/corelib/io/qresourceengine/qresourceengine.pro
+index 1e12a41dea..5db9225282 100644
+--- a/tests/auto/corelib/io/qresourceengine/qresourceengine.pro
++++ b/tests/auto/corelib/io/qresourceengine/qresourceengine.pro
+@@ -1,2 +1,3 @@
+ TEMPLATE = subdirs
+ SUBDIRS = staticplugin qresourceengine_test.pro
++CONFIG += ordered
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index ae77e066..5548e4e1 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -37,6 +37,7 @@ SRC_URI += "\
     file://0019-zlib-Do-not-undefine-_FILE_OFFSET_BITS.patch \
     file://0020-evdevkeyboard-fix-input_event-time-related-compile.patch \
     file://0021-evdevtouch-fix-input_event-time-related-compile.patch \
+    file://0022-Add-config-ordered-in-tests-qresourceengine-pro.patch \
 "
 
 # for syncqt