From 4d4a34c5d29ef7b730eb9da87b39f91352ef66fa Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 27 Feb 2015 11:12:46 +0100 Subject: recipes: Refresh patches to match git recipes 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 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 @@ -From aae38b0ff226f287ad40f6eb423f1b974f548b73 Mon Sep 17 00:00:00 2001 +From 046ff855191e587ce9263f40bd46183c175b6387 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 02/11] qlibraryinfo: allow to set qt.conf from the outside +Subject: [PATCH 02/13] 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 @@ -19,10 +19,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 7ca0aa7..d68c51b 100644 +index d592032..c418c5e 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -139,7 +139,10 @@ QLibrarySettings::QLibrarySettings() +@@ -138,7 +138,10 @@ QLibrarySettings::QLibrarySettings() QSettings *QLibraryInfoPrivate::findConfiguration() { @@ -35,5 +35,5 @@ index 7ca0aa7..d68c51b 100644 if(!QFile::exists(qtconfig)) qtconfig = qt_libraryInfoFile(); -- -2.1.3 +2.3.1 -- cgit v1.2.3-54-g00ecf