qtbase: update patch

Update the patch to apply after upstream changes and apply the
patch only for native builds to avoid possible runtime overheads
for feature needed only during bitbake builds.

Pick-to: dev 6.8
Change-Id: Ib72f090dee1ea972a2c883c4c5bde6cb403b479c
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>

recipes-qt/qt6/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch

@@ -1,4 +1,4 @@
-From 2c38d67692e26c7909be77b1eb4d54cecb14c5ad Mon Sep 17 00:00:00 2001
+From 27896986b3c2930ccbbe062d3e7a0b7bcc08caf1 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
@@ -20,10 +20,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index 94f3e60deb..d778b71eae 100644
+index 4b116c54b2e..bfa21c997b4 100644
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -102,7 +102,12 @@ static std::unique_ptr<QSettings> findConfiguration()
+@@ -103,7 +103,12 @@ static std::unique_ptr<QSettings> findConfiguration()
      if (qtconfManualPath)
          return std::make_unique<QSettings>(*qtconfManualPath, QSettings::IniFormat);
  
@@ -34,6 +34,6 @@ index 94f3e60deb..d778b71eae 100644
 +        return std::make_unique<QSettings>(qtconfig, QSettings::IniFormat);
 +
 +    qtconfig = QStringLiteral(":/qt/etc/qt.conf");
-     if (QFile::exists(qtconfig))
+     if (QResource(qtconfig, QLocale::c()).isValid())
          return std::make_unique<QSettings>(qtconfig, QSettings::IniFormat);
  #ifdef Q_OS_DARWIN

recipes-qt/qt6/qtbase_git.bb

@@ -19,10 +19,12 @@ include recipes-qt/qt6/qt6.inc
 
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
-    file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
     file://0004-Fix-qt.toolchain.cmake-for-SDK-use.patch \
     file://0005-testlib-don-t-track-the-build-or-source-directories.patch \
 "
+SRC_URI:append:class-native = "\
+    file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+"
 
 DEPENDS += "\
     patchelf-native \