diff options
author | Ross Burton <ross.burton@intel.com> | 2012-11-19 14:22:34 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-20 15:31:47 +0000 |
commit | 1f71583dacaf2abde4930815b3415c3af104f514 (patch) | |
tree | 205b617c5ad55675e2a050ace6c933e29d30ecf2 /meta/recipes-qt/qt4/qt4-4.8.1/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | |
parent | 4e2de8f749103a54d51f627e75401b70bb41d47c (diff) | |
download | poky-1f71583dacaf2abde4930815b3415c3af104f514.tar.gz |
qt4: remove 4.8.1
(From OE-Core rev: 5f6d7d61d79215ffe38aa6b122ae5ac0af7e859a)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.1/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.1/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch deleted file mode 100644 index a3a8dae641..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.1/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From 51c37481a0c0ea946567ea2344107428e6d71590 Mon Sep 17 00:00:00 2001 | ||
2 | From: Holger Freyther <zecke@selfish.org> | ||
3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 | ||
4 | Subject: [PATCH 01/22] qlibraryinfo: allow to set qt.conf from the outside | ||
5 | using the environment | ||
6 | |||
7 | Allow to set a qt.conf from the outside using the environment. This allows | ||
8 | to inject new prefixes and other paths into qmake. This is needed when using | ||
9 | the same qmake binary to build qt/x11 and qt/embedded | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
14 | --- | ||
15 | src/corelib/global/qlibraryinfo.cpp | 5 +++++ | ||
16 | 1 file changed, 5 insertions(+) | ||
17 | |||
18 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp | ||
19 | index 2862c2c..3a36b01 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 | -- | ||
42 | 1.7.12 | ||
43 | |||