summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index bae0dd3b..f8420c04 100644
--- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -1,7 +1,7 @@
1From aae38b0ff226f287ad40f6eb423f1b974f548b73 Mon Sep 17 00:00:00 2001 1From 046ff855191e587ce9263f40bd46183c175b6387 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 02/11] qlibraryinfo: allow to set qt.conf from the outside 4Subject: [PATCH 02/13] qlibraryinfo: allow to set qt.conf from the outside
5 using the environment 5 using the environment
6 6
7Allow to set a qt.conf from the outside using the environment. This allows 7Allow to set a qt.conf from the outside using the environment. This allows
@@ -19,10 +19,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
19 1 file changed, 4 insertions(+), 1 deletion(-) 19 1 file changed, 4 insertions(+), 1 deletion(-)
20 20
21diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp 21diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
22index 7ca0aa7..d68c51b 100644 22index d592032..c418c5e 100644
23--- a/src/corelib/global/qlibraryinfo.cpp 23--- a/src/corelib/global/qlibraryinfo.cpp
24+++ b/src/corelib/global/qlibraryinfo.cpp 24+++ b/src/corelib/global/qlibraryinfo.cpp
25@@ -139,7 +139,10 @@ QLibrarySettings::QLibrarySettings() 25@@ -138,7 +138,10 @@ QLibrarySettings::QLibrarySettings()
26 26
27 QSettings *QLibraryInfoPrivate::findConfiguration() 27 QSettings *QLibraryInfoPrivate::findConfiguration()
28 { 28 {
@@ -35,5 +35,5 @@ index 7ca0aa7..d68c51b 100644
35 if(!QFile::exists(qtconfig)) 35 if(!QFile::exists(qtconfig))
36 qtconfig = qt_libraryInfoFile(); 36 qtconfig = qt_libraryInfoFile();
37-- 37--
382.1.3 382.3.1
39 39