summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2012-11-19 10:41:57 -0200
committerOtavio Salvador <otavio@ossystems.com.br>2012-11-19 10:41:57 -0200
commit5bd1456605d1f876b027baaf178664c784966493 (patch)
treebe3cf2a10c615a7fb48ff2df65b23187deaf6435 /recipes-qt/qt5/qtbase
parent95e49bf0f426e1f4bb063fb8fb4166d393333817 (diff)
downloadmeta-qt5-5bd1456605d1f876b027baaf178664c784966493.tar.gz
qtbase: Drop unused patch for setting qt.conf override support
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-qt/qt5/qtbase')
-rw-r--r--recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch44
1 files changed, 0 insertions, 44 deletions
diff --git a/recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
deleted file mode 100644
index 6b5bed9a..00000000
--- a/recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From d5a0cf45ebbd6a5911f8bd208fe355eb990b5388 Mon Sep 17 00:00:00 2001
2From: Holger Freyther <zecke@selfish.org>
3Date: Wed, 26 Sep 2012 17:22:30 +0200
4Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the environment
5
6Allow to set a qt.conf from the outside using the environment. This allows
7to inject new prefixes and other paths into qmake. This is needed when using
8the same qmake binary to build qt/x11 and qt/embedded
9
10Upstream-Status: Pending
11
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13---
14 src/corelib/global/qlibraryinfo.cpp | 5 +++++
15 1 files changed, 5 insertions(+), 0 deletions(-)
16
17diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
18index ccf0718..497e72e 100644
19--- a/src/corelib/global/qlibraryinfo.cpp
20+++ b/src/corelib/global/qlibraryinfo.cpp
21@@ -49,6 +49,8 @@
22 QT_BEGIN_NAMESPACE
23 extern QString qt_libraryInfoFile();
24 QT_END_NAMESPACE
25+#include <stdlib.h>
26+#include <stdio.h>
27 #elif defined(QT_BOOTSTRAPPED)
28 QString qt_libraryInfoFile()
29 {
30@@ -142,6 +143,11 @@ QSettings *QLibraryInfoPrivate::findConfiguration()
31 #ifdef QT_BOOTSTRAPPED
32 if(!QFile::exists(qtconfig))
33 qtconfig = qt_libraryInfoFile();
34+ if (!QFile::exists(qtconfig)) {
35+ QByteArray config = getenv("QT_CONF_PATH");
36+ qtconfig = QFile::decodeName(config);
37+ printf("using qt.conf %s", qtconfig.toLatin1().data());
38+ }
39 #else
40 if (!QFile::exists(qtconfig) && QCoreApplication::instance()) {
41 #ifdef Q_OS_MAC
42--
431.7.4.1
44