qtbase: update patches

Fuzz detected.

Pick-to: dev 6.5
Change-Id: I13269e8d0cf239f32348e70dec3e2e7fb6e2cc84
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

2 files changed, 14 insertions, 12 deletions

diff --git a/recipes-qt/qt6/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt6/qtbase/0001-Add-linux-oe-g-platform.patch
index 024b74f..82d17c2 100644
--- a/recipes-qt/qt6/qtbase/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt6/qtbase/0001-Add-linux-oe-g-platform.patch
@@ -1,4 +1,4 @@
-From 7e15934773ea428c2a35f80a0485f700ad9891cf Mon Sep 17 00:00:00 2001
+From a08e167d51c33f91009ba27adaa083c783c1ac54 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Mon, 15 Apr 2013 04:29:32 +0200
 Subject: [PATCH] Add linux-oe-g++ platform
@@ -12,6 +12,7 @@ Upstream-Status: Inappropriate [embedded specific]
 
 Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+
 ---
  mkspecs/features/qt.prf              |  6 ++---
  mkspecs/features/qt_functions.prf    |  4 +--
@@ -24,19 +25,19 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  create mode 100644 mkspecs/oe-device-extra.pri
 
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index 729f3ac73d..84efd90d47 100644
+index 3c4b284b68..a7545ace5c 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
-@@ -150,7 +150,7 @@ import_plugins:qtConfig(static) {
-             plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB
+@@ -164,7 +164,7 @@ import_plugins {
+             plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix($$config_variable).$$QMAKE_EXTENSION_STATICLIB
              plug_path = $$eval(QT_PLUGIN.$${plug}.PATH)
              isEmpty(plug_path): \
 -                plug_path = $$[QT_INSTALL_PLUGINS/get]
 +                plug_path = $$[QT_INSTALL_PLUGINS]
              LIBS += $$plug_path/$$plug_type/$$plug_name
          } else {
-             LIBS += -l$${plug}$$qtPlatformTargetSuffix()
-@@ -283,8 +283,8 @@ for(ever) {
+             LIBS += -l$${plug}$$qtPlatformTargetSuffix(CONFIG)
+@@ -319,8 +319,8 @@ for(ever) {
  # static builds: link qml import plugins into the target.
  contains(all_qt_module_deps, qml): \
          qtConfig(static):import_plugins:!host_build:!no_import_scan {
@@ -48,10 +49,10 @@ index 729f3ac73d..84efd90d47 100644
      # run qmlimportscanner
      qtPrepareLibExecTool(QMLIMPORTSCANNER, qmlimportscanner, , system)
 diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
-index dd780ad556..0664ef789e 100644
+index f1371c8cc6..84cbf4a476 100644
 --- a/mkspecs/features/qt_functions.prf
 +++ b/mkspecs/features/qt_functions.prf
-@@ -91,7 +91,7 @@ defineTest(qtPrepareTool) {
+@@ -95,7 +95,7 @@ defineTest(qtPrepareTool) {
      cmd = $$eval(QT_TOOL.$${2}.binary)
      isEmpty(cmd) {
          isEmpty(5) {
@@ -60,7 +61,7 @@ index dd780ad556..0664ef789e 100644
          } else {
              instloc = $$5
          }
-@@ -136,7 +136,7 @@ defineTest(qtPrepareTool) {
+@@ -140,7 +140,7 @@ defineTest(qtPrepareTool) {
  # Forwards its arguments to qtPrepareTool but defaults the installation location to
  # $$[QT_HOST_LIBEXECS]
  defineTest(qtPrepareLibExecTool) {
diff --git a/recipes-qt/qt6/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt6/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index 5d2f2eb..4bd74ee 100644
--- a/recipes-qt/qt6/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/recipes-qt/qt6/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -1,4 +1,4 @@
-From bc9476229b98e567420e177a8ede27fd28451895 Mon Sep 17 00:00:00 2001
+From 1662965c5b1fd00fb61c3fc29833324999c0bfc2 Mon Sep 17 00:00:00 2001
 From: Holger Freyther <zecke@selfish.org>
 Date: Wed, 26 Sep 2012 17:22:30 +0200
 Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
@@ -15,15 +15,16 @@ Upstream-Status: Inappropriate [embedded specific]
 
 Change-Id: I41595c6ce7514e8f197d0a19a1308c9460037d1b
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+
 ---
  src/corelib/global/qlibraryinfo.cpp | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index a4764713c4..0fc456472d 100644
+index 715bda488c..3e9314be86 100644
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -126,7 +126,12 @@ static QSettings *findConfiguration()
+@@ -92,7 +92,12 @@ static QSettings *findConfiguration()
      if (QLibraryInfoPrivate::qtconfManualPath)
          return new QSettings(*QLibraryInfoPrivate::qtconfManualPath, QSettings::IniFormat);