CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

qtbase: update patch

Browse Source 
Update patch to work with latest changed.

Pick-to: 6.8
Change-Id: I9834ec4d39ae657d4b89530ae454198db339f04e
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 28deeb771f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Samuli Piippo 2025-01-02 08:26:53 +00:00
parent 87ef009a93
commit 2da362ade0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 4064b8757cbb28588fdff2529ea203bf3eabc579 Mon Sep 17 00:00:00 2001
From 2c38d67692e26c7909be77b1eb4d54cecb14c5ad 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,20 +20,20 @@ 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 92729b06f1..dac7857600 100644
index 94f3e60deb..d778b71eae 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -101,7 +101,12 @@ static QSettings *findConfiguration()
@@ -102,7 +102,12 @@ static std::unique_ptr<QSettings> findConfiguration()
if (qtconfManualPath)
return new QSettings(*qtconfManualPath, QSettings::IniFormat);
return std::make_unique<QSettings>(*qtconfManualPath, QSettings::IniFormat);
- QString qtconfig = QStringLiteral(":/qt/etc/qt.conf");
+ QByteArray config = getenv("OE_QMAKE_QTCONF_PATH");
+ QString qtconfig = QFile::decodeName(config);
+ if (QFile::exists(qtconfig))
+ return new QSettings(qtconfig, QSettings::IniFormat);
+ return std::make_unique<QSettings>(qtconfig, QSettings::IniFormat);
+
+ qtconfig = QStringLiteral(":/qt/etc/qt.conf");
if (QFile::exists(qtconfig))
return new QSettings(qtconfig, QSettings::IniFormat);
return std::make_unique<QSettings>(qtconfig, QSettings::IniFormat);
#ifdef Q_OS_DARWIN