From c27dac3e4e11fb512a1483dacb8a4dcceb827323 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 3 Apr 2013 16:42:45 +0200 Subject: qtbase: use the same patch for qt.conf override for target and native --- recipes-qt/qt5/qtbase-native.inc | 3 +- ...Allow-qt.conf-override-when-bootstrapping.patch | 30 -------------- recipes-qt/qt5/qtbase.inc | 2 +- ...o-Allow-the-specification-of-where-to-loa.patch | 32 --------------- ...o-allow-to-set-qt.conf-from-the-outside-u.patch | 46 ++++++++++++++++++++++ 5 files changed, 48 insertions(+), 65 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch delete mode 100644 recipes-qt/qt5/qtbase/0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch create mode 100644 recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index c401c7bd..43e32530 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -13,8 +13,7 @@ SSTATE_SCAN_FILES += "*.pri *.prl" QT_DIR_NAME ?= "qt5" SRC_URI += " \ - file://0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch \ - file://0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch \ + file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ file://0001-Always-build-uic.patch \ " diff --git a/recipes-qt/qt5/qtbase-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch b/recipes-qt/qt5/qtbase-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch deleted file mode 100644 index 1b294fd2..00000000 --- a/recipes-qt/qt5/qtbase-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 40e6c0f88774b55111c63ed28bba626141797476 Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Tue, 4 Dec 2012 15:32:33 -0800 -Subject: [PATCH 3/3] qtbase: Allow qt.conf override when bootstrapping - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Mikko Levonmaa ---- - qmake/option.cpp | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/qmake/option.cpp b/qmake/option.cpp -index 91c154a..a4f3a85 100644 ---- a/qmake/option.cpp -+++ b/qmake/option.cpp -@@ -647,6 +647,10 @@ qmakeAddCacheClear(qmakeCacheClearFunc func, void **data) - - QString qt_libraryInfoFile() - { -+ QString qtconfig = QFile::decodeName(getenv("QT_CONF_PATH")); -+ if (QFile::exists(qtconfig)) { -+ return qtconfig; -+ } - if (!Option::globals->qmake_abslocation.isEmpty()) - return QDir(QFileInfo(Option::globals->qmake_abslocation).absolutePath()).filePath("qt.conf"); - return QString(); --- -1.7.4.1 - diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index d4a5652d..8ada1910 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -1,7 +1,7 @@ require qt5.inc SRC_URI += " \ - file://0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch \ + file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ file://0002-qmake-is-already-built-in-qt5-tools-native.patch \ file://0003-Allow-building-a-separate-qmake-for-the-target.patch \ file://qmake.conf.sh \ 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 deleted file mode 100644 index 10219ec9..00000000 --- a/recipes-qt/qt5/qtbase/0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4dcf1eeaa1742435027ad0cb2a218e7e9b776011 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador -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,9 @@ QSettings *QLibraryInfoPrivate::findConfiguration() - } - } - #endif -+ if (!QFile::exists(qtconfig)) { -+ qtconfig = QFile::decodeName(getenv("QT_CONF_PATH")); -+ } - if (QFile::exists(qtconfig)) - return new QSettings(qtconfig, QSettings::IniFormat); - return 0; //no luck --- -1.7.10.4 - diff --git a/recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch new file mode 100644 index 00000000..857d5e84 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -0,0 +1,46 @@ +From 2af433da710aff74445cb5148d369427bdd501de Mon Sep 17 00:00:00 2001 +From: Holger Freyther +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: Pending + +Signed-off-by: Martin Jansa +--- + src/corelib/global/qlibraryinfo.cpp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp +index 747fd87..c9f8170 100644 +--- a/src/corelib/global/qlibraryinfo.cpp ++++ b/src/corelib/global/qlibraryinfo.cpp +@@ -140,6 +140,10 @@ QSettings *QLibraryInfoPrivate::findConfiguration() + { + QString qtconfig = QStringLiteral(":/qt/etc/qt.conf"); + #ifdef QT_BOOTSTRAPPED ++ if (!QFile::exists(qtconfig)) { ++ QByteArray config = getenv("QT_CONF_PATH"); ++ qtconfig = QFile::decodeName(config); ++ } + if(!QFile::exists(qtconfig)) + qtconfig = qt_libraryInfoFile(); + #else +@@ -164,6 +168,10 @@ QSettings *QLibraryInfoPrivate::findConfiguration() + } + } + #endif ++ if (!QFile::exists(qtconfig)) { ++ QByteArray config = getenv("QT_CONF_PATH"); ++ qtconfig = QFile::decodeName(config); ++ } + if (QFile::exists(qtconfig)) + return new QSettings(qtconfig, QSettings::IniFormat); + return 0; //no luck +-- +1.8.1.5 + -- cgit v1.2.3-54-g00ecf