diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2012-11-19 17:25:59 -0200 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2012-11-19 17:25:59 -0200 |
commit | bb72ea51a11b04d33ddc58ca4e251e575cac9cbd (patch) | |
tree | ed953215f439c5162cd96e1341de00cea8880a1b /recipes-qt/qt5/qtbase | |
parent | 5bd1456605d1f876b027baaf178664c784966493 (diff) | |
download | meta-qt5-bb72ea51a11b04d33ddc58ca4e251e575cac9cbd.tar.gz |
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>
Diffstat (limited to 'recipes-qt/qt5/qtbase')
-rw-r--r-- | recipes-qt/qt5/qtbase/0001-Allowing-the-customization-of-the-paths.patch | 37 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase/0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch | 33 |
2 files changed, 33 insertions, 37 deletions
diff --git a/recipes-qt/qt5/qtbase/0001-Allowing-the-customization-of-the-paths.patch b/recipes-qt/qt5/qtbase/0001-Allowing-the-customization-of-the-paths.patch deleted file mode 100644 index 073df378..00000000 --- a/recipes-qt/qt5/qtbase/0001-Allowing-the-customization-of-the-paths.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 183cf66e2770f7fbc420cf7aa94a9a8564785044 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mikko Levonmaa <mikko.levonmaa@palm.com> | ||
3 | Date: Wed, 7 Nov 2012 14:48:46 -0800 | ||
4 | Subject: [PATCH] Allowing the customization of the paths | ||
5 | |||
6 | Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com> | ||
7 | --- | ||
8 | src/corelib/global/qlibraryinfo.cpp | 6 ++++++ | ||
9 | 1 files changed, 6 insertions(+), 0 deletions(-) | ||
10 | |||
11 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp | ||
12 | index ccf0718..487b8eb 100644 | ||
13 | --- a/src/corelib/global/qlibraryinfo.cpp | ||
14 | +++ b/src/corelib/global/qlibraryinfo.cpp | ||
15 | @@ -49,6 +49,7 @@ | ||
16 | QT_BEGIN_NAMESPACE | ||
17 | extern QString qt_libraryInfoFile(); | ||
18 | QT_END_NAMESPACE | ||
19 | +#include <stdlib.h> | ||
20 | #elif defined(QT_BOOTSTRAPPED) | ||
21 | QString qt_libraryInfoFile() | ||
22 | { | ||
23 | @@ -164,6 +165,11 @@ QSettings *QLibraryInfoPrivate::findConfiguration() | ||
24 | } | ||
25 | } | ||
26 | #endif | ||
27 | + if (!QFile::exists(qtconfig)) { | ||
28 | + QByteArray config = getenv("QT_CONF_PATH"); | ||
29 | + qtconfig = QFile::decodeName(config); | ||
30 | + printf("Using qt.conf from: %s\n", qtconfig.toLatin1().data()); | ||
31 | + } | ||
32 | if (QFile::exists(qtconfig)) | ||
33 | return new QSettings(qtconfig, QSettings::IniFormat); | ||
34 | return 0; //no luck | ||
35 | -- | ||
36 | 1.7.4.1 | ||
37 | |||
diff --git a/recipes-qt/qt5/qtbase/0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch b/recipes-qt/qt5/qtbase/0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch new file mode 100644 index 00000000..f72bccd4 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 4dcf1eeaa1742435027ad0cb2a218e7e9b776011 Mon Sep 17 00:00:00 2001 | ||
2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
3 | Date: Mon, 19 Nov 2012 10:19:52 -0200 | ||
4 | Subject: [PATCH] qlibraryinfo: Allow the specification of where to load | ||
5 | qt.conf | ||
6 | |||
7 | This is important to allow cross toolchains to work out of box. | ||
8 | |||
9 | This patch was based on an existent patch in OpenEmbedded. | ||
10 | |||
11 | Change-Id: Idc4feee95a9961db02752d88da9cfe360e89f8e3 | ||
12 | --- | ||
13 | src/corelib/global/qlibraryinfo.cpp | 4 ++++ | ||
14 | 1 file changed, 4 insertions(+) | ||
15 | |||
16 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp | ||
17 | index a756577..0c92e12 100644 | ||
18 | --- a/src/corelib/global/qlibraryinfo.cpp | ||
19 | +++ b/src/corelib/global/qlibraryinfo.cpp | ||
20 | @@ -164,6 +164,10 @@ QSettings *QLibraryInfoPrivate::findConfiguration() | ||
21 | } | ||
22 | } | ||
23 | #endif | ||
24 | + if (!QFile::exists(qtconfig)) { | ||
25 | + qtconfig = QFile::decodeName(getenv("QT_CONF_PATH")); | ||
26 | + printf("Using qt.conf from: %s\n", qtconfig.toLatin1().data()); | ||
27 | + } | ||
28 | if (QFile::exists(qtconfig)) | ||
29 | return new QSettings(qtconfig, QSettings::IniFormat); | ||
30 | return 0; //no luck | ||
31 | -- | ||
32 | 1.7.10.4 | ||
33 | |||