1*4882a593SmuzhiyunFrom 31a126a7e5e08fe1d3ba84639d2121453a71606f Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Holger Freyther <zecke@selfish.org>
3*4882a593SmuzhiyunDate: Wed, 26 Sep 2012 17:22:30 +0200
4*4882a593SmuzhiyunSubject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
5*4882a593Smuzhiyun environment
6*4882a593Smuzhiyun
7*4882a593SmuzhiyunAllow to set a qt.conf from the outside using the environment. This allows
8*4882a593Smuzhiyunto inject new prefixes and other paths into qmake. This is needed when using
9*4882a593Smuzhiyunthe same qmake binary to build qt/x11 and qt/embedded
10*4882a593Smuzhiyun
11*4882a593SmuzhiyunUpstream-Status: Inappropriate [embedded specific]
12*4882a593Smuzhiyun  again very OE specific to read everything from environment (reusing the same
13*4882a593Smuzhiyun  qmake from sstate and replacing all configured paths in it with qt.conf from
14*4882a593Smuzhiyun  environment).
15*4882a593Smuzhiyun
16*4882a593SmuzhiyunChange-Id: I41595c6ce7514e8f197d0a19a1308c9460037d1b
17*4882a593SmuzhiyunSigned-off-by: Martin Jansa <Martin.Jansa@gmail.com>
18*4882a593Smuzhiyun---
19*4882a593Smuzhiyun src/corelib/global/qlibraryinfo.cpp | 5 ++++-
20*4882a593Smuzhiyun 1 file changed, 4 insertions(+), 1 deletion(-)
21*4882a593Smuzhiyun
22*4882a593Smuzhiyundiff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
23*4882a593Smuzhiyunindex 8ceb763491..ea102f788d 100644
24*4882a593Smuzhiyun--- a/src/corelib/global/qlibraryinfo.cpp
25*4882a593Smuzhiyun+++ b/src/corelib/global/qlibraryinfo.cpp
26*4882a593Smuzhiyun@@ -183,7 +183,10 @@ void QLibrarySettings::load()
27*4882a593Smuzhiyun QSettings *QLibraryInfoPrivate::findConfiguration()
28*4882a593Smuzhiyun {
29*4882a593Smuzhiyun #ifdef QT_BUILD_QMAKE
30*4882a593Smuzhiyun-    QString qtconfig = qmake_libraryInfoFile();
31*4882a593Smuzhiyun+    QByteArray config = getenv("OE_QMAKE_QTCONF_PATH");
32*4882a593Smuzhiyun+    QString qtconfig = QFile::decodeName(config);
33*4882a593Smuzhiyun+    if(qtconfig.isEmpty() || !QFile::exists(qtconfig))
34*4882a593Smuzhiyun+        qtconfig = qmake_libraryInfoFile();
35*4882a593Smuzhiyun     if (QFile::exists(qtconfig))
36*4882a593Smuzhiyun         return new QSettings(qtconfig, QSettings::IniFormat);
37*4882a593Smuzhiyun #else
38