From 6e6c08bf32e7ed0b60a9d04c708fe25491e8b06b Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 14 Feb 2022 10:00:52 +0200 Subject: [PATCH] qtbase: update patch Update patch to apply cleanly again. Change-Id: I235a321bdf05e6d74871f204dd154929478ecc3c Reviewed-by: Mikko Gronoff (cherry picked from commit 28c7a28568b7b965fbe3b3b12113396e510892e5) Reviewed-by: Qt Cherry-pick Bot --- ...yinfo-allow-to-set-qt.conf-from-the-outside-u.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 6c44928..5d2f2eb 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 e483cdd14d5485109d2f160e7d4eb2bfa6e8212e Mon Sep 17 00:00:00 2001 +From bc9476229b98e567420e177a8ede27fd28451895 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the @@ -20,12 +20,12 @@ Signed-off-by: Martin Jansa 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index fccefa8008..956636ed77 100644 +index a4764713c4..0fc456472d 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -120,7 +120,12 @@ static QSettings *findConfiguration() - if (!QLibraryInfoPrivate::qtconfManualPath.isEmpty()) - return new QSettings(QLibraryInfoPrivate::qtconfManualPath, QSettings::IniFormat); +@@ -126,7 +126,12 @@ static QSettings *findConfiguration() + if (QLibraryInfoPrivate::qtconfManualPath) + return new QSettings(*QLibraryInfoPrivate::qtconfManualPath, QSettings::IniFormat); - QString qtconfig = QStringLiteral(":/qt/etc/qt.conf"); + QByteArray config = getenv("OE_QMAKE_QTCONF_PATH");