summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2021-05-01 20:13:18 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2021-05-01 23:29:26 +0200
commitdcf2ece48ea45336f44e01fd3f93e0efa0a163b6 (patch)
tree9c93b0ba940917d1ab61975bed82339af19a0dcd /recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
parentc7ec5568d86396de9571e1de111b92c9e6f86f20 (diff)
downloadmeta-qt5-dcf2ece48ea45336f44e01fd3f93e0efa0a163b6.tar.gz
qtbase: fix build with gcc-11
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index 9c11e6de..f8116772 100644
--- a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -1,4 +1,4 @@
1From 73e2aad711fe5d94f0aec72c353e5acf957d66d2 Mon Sep 17 00:00:00 2001 1From d0d2b716621b6e1dd874f3575e099f8f98241ffb Mon Sep 17 00:00:00 2001
2From: Holger Freyther <zecke@selfish.org> 2From: Holger Freyther <zecke@selfish.org>
3Date: Wed, 26 Sep 2012 17:22:30 +0200 3Date: Wed, 26 Sep 2012 17:22:30 +0200
4Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the 4Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
@@ -20,7 +20,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
20 1 file changed, 4 insertions(+), 1 deletion(-) 20 1 file changed, 4 insertions(+), 1 deletion(-)
21 21
22diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp 22diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
23index c0a5369cdd..df620d6ebe 100644 23index f2ada4ab30..62c6feae17 100644
24--- a/src/corelib/global/qlibraryinfo.cpp 24--- a/src/corelib/global/qlibraryinfo.cpp
25+++ b/src/corelib/global/qlibraryinfo.cpp 25+++ b/src/corelib/global/qlibraryinfo.cpp
26@@ -174,7 +174,10 @@ void QLibrarySettings::load() 26@@ -174,7 +174,10 @@ void QLibrarySettings::load()