38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
|
From 64518ca83c405b8666739909f0c9daba4928f070 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Holger Freyther <zecke@selfish.org>
|
||
|
|
Date: Wed, 26 Sep 2012 17:22:30 +0200
|
||
|
|
Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
|
||
|
|
environment
|
||
|
|
|
||
|
|
Allow to set a qt.conf from the outside using the environment. This allows
|
||
|
|
to inject new prefixes and other paths into qmake. This is needed when using
|
||
|
|
the same qmake binary to build qt/x11 and qt/embedded
|
||
|
|
|
||
|
|
Upstream-Status: Inappropriate [embedded specific]
|
||
|
|
again very OE specific to read everything from environment (reusing the same
|
||
|
|
qmake from sstate and replacing all configured paths in it with qt.conf from
|
||
|
|
environment).
|
||
|
|
|
||
|
|
Change-Id: I41595c6ce7514e8f197d0a19a1308c9460037d1b
|
||
|
|
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||
|
|
---
|
||
|
|
src/corelib/global/qlibraryinfo.cpp | 5 ++++-
|
||
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
|
||
|
|
index f1d7832e46..312fd2b0c8 100644
|
||
|
|
--- a/src/corelib/global/qlibraryinfo.cpp
|
||
|
|
+++ b/src/corelib/global/qlibraryinfo.cpp
|
||
|
|
@@ -183,7 +183,10 @@ void QLibrarySettings::load()
|
||
|
|
QSettings *QLibraryInfoPrivate::findConfiguration()
|
||
|
|
{
|
||
|
|
#ifdef QT_BUILD_QMAKE
|
||
|
|
- QString qtconfig = qmake_libraryInfoFile();
|
||
|
|
+ QByteArray config = getenv("OE_QMAKE_QTCONF_PATH");
|
||
|
|
+ QString qtconfig = QFile::decodeName(config);
|
||
|
|
+ if(qtconfig.isEmpty() || !QFile::exists(qtconfig))
|
||
|
|
+ qtconfig = qmake_libraryInfoFile();
|
||
|
|
if (QFile::exists(qtconfig))
|
||
|
|
return new QSettings(qtconfig, QSettings::IniFormat);
|
||
|
|
#else
|