From 13ed17b2baeb253961885c469ba3c97b9ed420e5 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Thu, 15 Nov 2012 20:38:27 +0100 Subject: qtbase: add recipe for git version Signed-off-by: Mikko Levonmaa Signed-off-by: Martin Jansa --- ...1-Allowing-the-customization-of-the-paths.patch | 37 ++++++++++++++++++ ...o-allow-to-set-qt.conf-from-the-outside-u.patch | 44 ++++++++++++++++++++++ ...make-is-already-built-in-qt5-tools-native.patch | 29 ++++++++++++++ ...-building-a-separate-qmake-for-the-target.patch | 28 ++++++++++++++ 4 files changed, 138 insertions(+) create mode 100644 recipes-qt/qt5/qtbase/0001-Allowing-the-customization-of-the-paths.patch create mode 100644 recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch create mode 100644 recipes-qt/qt5/qtbase/0002-qmake-is-already-built-in-qt5-tools-native.patch create mode 100644 recipes-qt/qt5/qtbase/0003-Allow-building-a-separate-qmake-for-the-target.patch (limited to 'recipes-qt/qt5/qtbase') 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 new file mode 100644 index 00000000..073df378 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0001-Allowing-the-customization-of-the-paths.patch @@ -0,0 +1,37 @@ +From 183cf66e2770f7fbc420cf7aa94a9a8564785044 Mon Sep 17 00:00:00 2001 +From: Mikko Levonmaa +Date: Wed, 7 Nov 2012 14:48:46 -0800 +Subject: [PATCH] Allowing the customization of the paths + +Signed-off-by: Mikko Levonmaa +--- + 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 + #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 + 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..6b5bed9a --- /dev/null +++ b/recipes-qt/qt5/qtbase/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -0,0 +1,44 @@ +From d5a0cf45ebbd6a5911f8bd208fe355eb990b5388 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 | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp +index ccf0718..497e72e 100644 +--- a/src/corelib/global/qlibraryinfo.cpp ++++ b/src/corelib/global/qlibraryinfo.cpp +@@ -49,6 +49,8 @@ + QT_BEGIN_NAMESPACE + extern QString qt_libraryInfoFile(); + QT_END_NAMESPACE ++#include ++#include + #elif defined(QT_BOOTSTRAPPED) + QString qt_libraryInfoFile() + { +@@ -142,6 +143,11 @@ QSettings *QLibraryInfoPrivate::findConfiguration() + #ifdef QT_BOOTSTRAPPED + if(!QFile::exists(qtconfig)) + qtconfig = qt_libraryInfoFile(); ++ if (!QFile::exists(qtconfig)) { ++ QByteArray config = getenv("QT_CONF_PATH"); ++ qtconfig = QFile::decodeName(config); ++ printf("using qt.conf %s", qtconfig.toLatin1().data()); ++ } + #else + if (!QFile::exists(qtconfig) && QCoreApplication::instance()) { + #ifdef Q_OS_MAC +-- +1.7.4.1 + diff --git a/recipes-qt/qt5/qtbase/0002-qmake-is-already-built-in-qt5-tools-native.patch b/recipes-qt/qt5/qtbase/0002-qmake-is-already-built-in-qt5-tools-native.patch new file mode 100644 index 00000000..0c1f63c6 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0002-qmake-is-already-built-in-qt5-tools-native.patch @@ -0,0 +1,29 @@ +From aab01049543f4508f1dc92fb62b980d1d0c3bcc0 Mon Sep 17 00:00:00 2001 +From: Michael Krelin +Date: Mon, 29 Oct 2012 20:07:49 -0700 +Subject: [PATCH] qmake is already built in qt5-tools-native + +Ported from OE by: Yu Ke +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Mikko Levonmaa +--- + configure | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index c3e61d6..5e43a19 100755 +--- a/configure ++++ b/configure +@@ -3594,7 +3594,7 @@ setBootstrapVariable() + } + + # build qmake +-if true; then ###[ '!' -f "$outpath/bin/qmake" ]; ++if false; then ###[ '!' -f "$outpath/bin/qmake" ]; + echo "Creating qmake. Please wait..." + + #mkspecs/default is used as a (gasp!) default mkspec so QMAKESPEC needn't be set once configured +-- +1.7.4.1 + diff --git a/recipes-qt/qt5/qtbase/0003-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase/0003-Allow-building-a-separate-qmake-for-the-target.patch new file mode 100644 index 00000000..781d6e54 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0003-Allow-building-a-separate-qmake-for-the-target.patch @@ -0,0 +1,28 @@ +From a2a01e1fd975e8e616b580423c3bf30db9c11b6d Mon Sep 17 00:00:00 2001 +From: Paul Eggleton +Date: Mon, 29 Oct 2012 20:26:36 -0700 +Subject: [PATCH] Allow building a separate qmake for the target + +Upstream-Status: Inappropriate [config] + +Signed-off-by: Paul Eggleton +Signed-off-by: Mikko Levonmaa +--- + qmake/qmake.pro | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/qmake/qmake.pro b/qmake/qmake.pro +index 0d92ac2..07fa80e 100644 +--- a/qmake/qmake.pro ++++ b/qmake/qmake.pro +@@ -9,6 +9,7 @@ CONFIG -= qt shared app_bundle uic + DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED \ + PROEVALUATOR_FULL PROEVALUATOR_DEBUG + DESTDIR = ../bin/ ++TARGET = qmake2 + + OBJECTS_DIR = . + MOC_DIR = . +-- +1.7.4.1 + -- cgit v1.2.3-54-g00ecf