Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From 55097d27e8b746b3d5ff437939caf1fa43c0d62b 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/21] 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 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 | -- |
| 42 | 1.8.0 |
| 43 | |