summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-4.8.4/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-12-05 22:59:01 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-11 15:54:37 +0000
commit89230eaa76edf2477af3f9bc31efe904d80ab71e (patch)
treee559c839558d0f9d7037979c65de64e49d2f75aa /meta/recipes-qt/qt4/qt4-4.8.4/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
parent348897358736c28240c084affaca5b4e2fbe499a (diff)
downloadpoky-89230eaa76edf2477af3f9bc31efe904d80ab71e.tar.gz
qt4: upgrade to 4.8.4
* changes in licenses are only s/Nokia/Digia/ (From OE-Core rev: 5d898695ab3ce368a1d1f2066bb980ee829ae077) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.4/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.4/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
new file mode 100644
index 0000000000..d8b0a09d17
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.4/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -0,0 +1,43 @@
1From 55097d27e8b746b3d5ff437939caf1fa43c0d62b Mon Sep 17 00:00:00 2001
2From: Holger Freyther <zecke@selfish.org>
3Date: Wed, 26 Sep 2012 17:22:30 +0200
4Subject: [PATCH 01/21] qlibraryinfo: allow to set qt.conf from the outside
5 using the environment
6
7Allow to set a qt.conf from the outside using the environment. This allows
8to inject new prefixes and other paths into qmake. This is needed when using
9the same qmake binary to build qt/x11 and qt/embedded
10
11Upstream-Status: Pending
12
13Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14---
15 src/corelib/global/qlibraryinfo.cpp | 5 +++++
16 1 file changed, 5 insertions(+)
17
18diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
19index 180dc39..4adad35 100644
20--- a/src/corelib/global/qlibraryinfo.cpp
21+++ b/src/corelib/global/qlibraryinfo.cpp
22@@ -54,6 +54,7 @@
23 QT_BEGIN_NAMESPACE
24 extern QString qmake_libraryInfoFile();
25 QT_END_NAMESPACE
26+#include <stdlib.h>
27 #else
28 # include "qcoreapplication.h"
29 #endif
30@@ -112,6 +113,10 @@ QSettings *QLibraryInfoPrivate::findConfiguration()
31 #ifdef BOOTSTRAPPING
32 if(!QFile::exists(qtconfig))
33 qtconfig = qmake_libraryInfoFile();
34+ if (!QFile::exists(qtconfig)) {
35+ QByteArray config = getenv("QT_CONF_PATH");
36+ qtconfig = QFile::decodeName(config);
37+ }
38 #else
39 if (!QFile::exists(qtconfig) && QCoreApplication::instance()) {
40 #ifdef Q_OS_MAC
41--
421.8.0
43