summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-4.8.1/qt-config.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.1/qt-config.patch')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/qt-config.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/qt-config.patch b/meta/recipes-qt/qt4/qt4-4.8.1/qt-config.patch
new file mode 100644
index 0000000000..2ab05ed1ad
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/qt-config.patch
@@ -0,0 +1,29 @@
1Allow to set a qt.conf from the outside using the environment. This allows
2to inject new prefixes and other paths into qmake. This is needed when using
3the same qmake binary to build qt/x11 and qt/embedded
4
5Original Author: Holger Freyther <zecke@selfish.org>
6Ported from OE by: Yu Ke <ke.yu@intel.com>
7Upstream-Status: Pending
8
9--- /tmp/qlibraryinfo.cpp 2008-08-02 17:16:41.000000000 +0200
10+++ qt-embedded-linux-opensource-src-4.4.1/src/corelib/global/qlibraryinfo.cpp 2008-08-02 17:17:42.000000000 +0200
11@@ -47,6 +47,7 @@
12 QT_BEGIN_NAMESPACE
13 extern QString qmake_libraryInfoFile();
14 QT_END_NAMESPACE
15+#include <stdlib.h>
16 #else
17 # include "qcoreapplication.h"
18 #endif
19@@ -113,6 +114,10 @@
20 #ifdef QT_BUILD_QMAKE
21 if(!QFile::exists(qtconfig))
22 qtconfig = qmake_libraryInfoFile();
23+ if (!QFile::exists(qtconfig)) {
24+ QByteArray config = getenv("QT_CONF_PATH");
25+ qtconfig = QFile::decodeName(config);
26+ }
27 #else
28 if (!QFile::exists(qtconfig) && QCoreApplication::instance()) {
29 #ifdef Q_OS_MAC