summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-06-04 16:50:53 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-06-10 12:11:52 +0200
commit06c25e6a6b9ff6f36f91412b2f8e10e8cd39bf3b (patch)
treee2ce79a677f7c2c7aab7d13b3ff2e372f2912e6e /recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
parent96c33dfbedacb94a216f7aede7d6d654a7d27953 (diff)
downloadmeta-qt5-06c25e6a6b9ff6f36f91412b2f8e10e8cd39bf3b.tar.gz
qtbase: Refresh patches to match with b5.3.0* branches on github.com/meta-qt5
* move more patches to "shared" section Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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 2f72dca5..14f0fc7d 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 841d1f06f3fd2f59f6b18067b02d5fcfc93aaa7a Mon Sep 17 00:00:00 2001 1From c45a30d1301f85e49eef66c06cccf2a16741a932 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/14] qlibraryinfo: allow to set qt.conf from the outside 4Subject: [PATCH 02/17] 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
@@ -16,10 +16,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
16 1 file changed, 4 insertions(+), 1 deletion(-) 16 1 file changed, 4 insertions(+), 1 deletion(-)
17 17
18diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp 18diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
19index 1c3b09f..c647a16 100644 19index 6d25325..80e0f30 100644
20--- a/src/corelib/global/qlibraryinfo.cpp 20--- a/src/corelib/global/qlibraryinfo.cpp
21+++ b/src/corelib/global/qlibraryinfo.cpp 21+++ b/src/corelib/global/qlibraryinfo.cpp
22@@ -149,7 +149,10 @@ QLibrarySettings::QLibrarySettings() 22@@ -153,7 +153,10 @@ QLibrarySettings::QLibrarySettings()
23 23
24 QSettings *QLibraryInfoPrivate::findConfiguration() 24 QSettings *QLibraryInfoPrivate::findConfiguration()
25 { 25 {
@@ -32,5 +32,5 @@ index 1c3b09f..c647a16 100644
32 if(!QFile::exists(qtconfig)) 32 if(!QFile::exists(qtconfig))
33 qtconfig = qt_libraryInfoFile(); 33 qtconfig = qt_libraryInfoFile();
34-- 34--
351.8.5.3 352.0.0
36 36