diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index f1447597..dfb6ae93 100644 --- a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,7 +1,7 @@ -From a256652b730e88566eb04dd7cdc39d5a1281c7fe Mon Sep 17 00:00:00 2001 +From e4636d4d18246278fb504cff3e16321c98d1f99d Mon Sep 17 00:00:00 2001 From: Holger Freyther <zecke@selfish.org> 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/14] 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 @@ -10,13 +10,14 @@ the same qmake binary to build qt/x11 and qt/embedded Upstream-Status: Pending +Change-Id: I0a53b713574e1860189fa52b44251eb4d19eeddc Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- - src/corelib/global/qlibraryinfo.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) + src/corelib/global/qlibraryinfo.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 5fb9640..acd11f5 100644 +index 5fb9640..6b40731 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -138,7 +138,10 @@ QLibrarySettings::QLibrarySettings() @@ -31,16 +32,6 @@ index 5fb9640..acd11f5 100644 #ifdef QT_BOOTSTRAPPED if(!QFile::exists(qtconfig)) qtconfig = qt_libraryInfoFile(); -@@ -165,7 +168,9 @@ QSettings *QLibraryInfoPrivate::findConfiguration() - } - #endif - if (QFile::exists(qtconfig)) -+ printf("Using qt.conf from: %s\n", qtconfig.toLatin1().data()); - return new QSettings(qtconfig, QSettings::IniFormat); -+ printf("qt.conf wasn't found!!\n"); - return 0; //no luck - } - -- 1.8.2.1 |