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 apply cleanly again.

Change-Id: I235a321bdf05e6d74871f204dd154929478ecc3c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 28c7a28568)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Samuli Piippo 2022-02-14 10:00:52 +02:00 committed by Qt Cherry-pick Bot
parent df990437f2
commit 6e6c08bf32
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 <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,12 +20,12 @@ 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 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");