qtbase: Replace patch to allow specification of qt.conf file
This patch has been cleaned to the minimum version and is ready for sending to upstream. Once it is accepted, a backport of the final version will be included here. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
parent
5bd1456605
commit
bb72ea51a1
|
@ -1,7 +1,7 @@
|
||||||
require qt5.inc
|
require qt5.inc
|
||||||
|
|
||||||
SRC_URI += " \
|
SRC_URI += " \
|
||||||
file://0001-Allowing-the-customization-of-the-paths.patch \
|
file://0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch \
|
||||||
file://0002-qmake-is-already-built-in-qt5-tools-native.patch \
|
file://0002-qmake-is-already-built-in-qt5-tools-native.patch \
|
||||||
file://0003-Allow-building-a-separate-qmake-for-the-target.patch \
|
file://0003-Allow-building-a-separate-qmake-for-the-target.patch \
|
||||||
"
|
"
|
||||||
|
|
|
@ -1,37 +0,0 @@
|
||||||
From 183cf66e2770f7fbc420cf7aa94a9a8564785044 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mikko Levonmaa <mikko.levonmaa@palm.com>
|
|
||||||
Date: Wed, 7 Nov 2012 14:48:46 -0800
|
|
||||||
Subject: [PATCH] Allowing the customization of the paths
|
|
||||||
|
|
||||||
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
|
|
||||||
---
|
|
||||||
src/corelib/global/qlibraryinfo.cpp | 6 ++++++
|
|
||||||
1 files changed, 6 insertions(+), 0 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
|
|
||||||
index ccf0718..487b8eb 100644
|
|
||||||
--- a/src/corelib/global/qlibraryinfo.cpp
|
|
||||||
+++ b/src/corelib/global/qlibraryinfo.cpp
|
|
||||||
@@ -49,6 +49,7 @@
|
|
||||||
QT_BEGIN_NAMESPACE
|
|
||||||
extern QString qt_libraryInfoFile();
|
|
||||||
QT_END_NAMESPACE
|
|
||||||
+#include <stdlib.h>
|
|
||||||
#elif defined(QT_BOOTSTRAPPED)
|
|
||||||
QString qt_libraryInfoFile()
|
|
||||||
{
|
|
||||||
@@ -164,6 +165,11 @@ QSettings *QLibraryInfoPrivate::findConfiguration()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
+ if (!QFile::exists(qtconfig)) {
|
|
||||||
+ QByteArray config = getenv("QT_CONF_PATH");
|
|
||||||
+ qtconfig = QFile::decodeName(config);
|
|
||||||
+ printf("Using qt.conf from: %s\n", qtconfig.toLatin1().data());
|
|
||||||
+ }
|
|
||||||
if (QFile::exists(qtconfig))
|
|
||||||
return new QSettings(qtconfig, QSettings::IniFormat);
|
|
||||||
return 0; //no luck
|
|
||||||
--
|
|
||||||
1.7.4.1
|
|
||||||
|
|
|
@ -0,0 +1,33 @@
|
||||||
|
From 4dcf1eeaa1742435027ad0cb2a218e7e9b776011 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Otavio Salvador <otavio@ossystems.com.br>
|
||||||
|
Date: Mon, 19 Nov 2012 10:19:52 -0200
|
||||||
|
Subject: [PATCH] qlibraryinfo: Allow the specification of where to load
|
||||||
|
qt.conf
|
||||||
|
|
||||||
|
This is important to allow cross toolchains to work out of box.
|
||||||
|
|
||||||
|
This patch was based on an existent patch in OpenEmbedded.
|
||||||
|
|
||||||
|
Change-Id: Idc4feee95a9961db02752d88da9cfe360e89f8e3
|
||||||
|
---
|
||||||
|
src/corelib/global/qlibraryinfo.cpp | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
|
||||||
|
index a756577..0c92e12 100644
|
||||||
|
--- a/src/corelib/global/qlibraryinfo.cpp
|
||||||
|
+++ b/src/corelib/global/qlibraryinfo.cpp
|
||||||
|
@@ -164,6 +164,10 @@ QSettings *QLibraryInfoPrivate::findConfiguration()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
+ if (!QFile::exists(qtconfig)) {
|
||||||
|
+ qtconfig = QFile::decodeName(getenv("QT_CONF_PATH"));
|
||||||
|
+ printf("Using qt.conf from: %s\n", qtconfig.toLatin1().data());
|
||||||
|
+ }
|
||||||
|
if (QFile::exists(qtconfig))
|
||||||
|
return new QSettings(qtconfig, QSettings::IniFormat);
|
||||||
|
return 0; //no luck
|
||||||
|
--
|
||||||
|
1.7.10.4
|
||||||
|
|
Loading…
Reference in New Issue