diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2024-03-03 20:00:09 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2024-03-06 00:11:35 +0200 |
| commit | 64d0ebee63eed30b9188d0734b91271d18ab5ef1 (patch) | |
| tree | a49587c6614dc38d71a14c7d78971595cd8dda1f | |
| parent | 8c46e471d905b2cf88a47a5dabe77da293e9b174 (diff) | |
qtbase: fix patch fuzz
Pick-to: dev 6.6 6.5
Change-Id: I286a9e70eb7e4a57f9398dc88dd61aaff90a9aea
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | recipes-qt/qt6/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | 11 |
1 files changed, 5 insertions, 6 deletions
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 4bd74ee..181c88c 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 1662965c5b1fd00fb61c3fc29833324999c0bfc2 Mon Sep 17 00:00:00 2001 +From 4064b8757cbb28588fdff2529ea203bf3eabc579 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,18 +15,17 @@ 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 715bda488c..3e9314be86 100644 +index 92729b06f1..dac7857600 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -92,7 +92,12 @@ static QSettings *findConfiguration() - if (QLibraryInfoPrivate::qtconfManualPath) - return new QSettings(*QLibraryInfoPrivate::qtconfManualPath, QSettings::IniFormat); +@@ -101,7 +101,12 @@ static QSettings *findConfiguration() + if (qtconfManualPath) + return new QSettings(*qtconfManualPath, QSettings::IniFormat); - QString qtconfig = QStringLiteral(":/qt/etc/qt.conf"); + QByteArray config = getenv("OE_QMAKE_QTCONF_PATH"); |