From 06c25e6a6b9ff6f36f91412b2f8e10e8cd39bf3b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 4 Jun 2014 16:50:53 +0200 Subject: 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 --- ...-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch') 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 @@ -From 841d1f06f3fd2f59f6b18067b02d5fcfc93aaa7a Mon Sep 17 00:00:00 2001 +From c45a30d1301f85e49eef66c06cccf2a16741a932 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 02/14] qlibraryinfo: allow to set qt.conf from the outside +Subject: [PATCH 02/17] qlibraryinfo: allow to set qt.conf from the outside using the environment Allow to set a qt.conf from the outside using the environment. This allows @@ -16,10 +16,10 @@ Signed-off-by: Martin Jansa 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 1c3b09f..c647a16 100644 +index 6d25325..80e0f30 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -149,7 +149,10 @@ QLibrarySettings::QLibrarySettings() +@@ -153,7 +153,10 @@ QLibrarySettings::QLibrarySettings() QSettings *QLibraryInfoPrivate::findConfiguration() { @@ -32,5 +32,5 @@ index 1c3b09f..c647a16 100644 if(!QFile::exists(qtconfig)) qtconfig = qt_libraryInfoFile(); -- -1.8.5.3 +2.0.0 -- cgit v1.2.3-54-g00ecf