From 17d2bf1cdd6a6b23a88a8e07dcb640e8f01115d2 Mon Sep 17 00:00:00 2001 From: Mikko Levonmaa Date: Tue, 4 Dec 2012 16:32:32 -0800 Subject: qtbase: mkspecs are now staged correctly They are placed under STAGING_DATADIR as they need to be kept separate from the native side. The reason for doing so is that some qt modules require native tools and the mkspecs in STAGING_DATADIR_NATIVE cannot be polluted with the target mkspecs There are still some packaging issues Signed-off-by: Mikko Levonmaa --- recipes-qt/qt5/qtbase/0001-Always-build-uic.patch | 31 ++++++++++++++++++++++ ...Allow-qt.conf-override-when-bootstrapping.patch | 31 ++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 recipes-qt/qt5/qtbase/0001-Always-build-uic.patch create mode 100644 recipes-qt/qt5/qtbase/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch (limited to 'recipes-qt/qt5/qtbase') diff --git a/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch new file mode 100644 index 00000000..3f2e3fd9 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch @@ -0,0 +1,31 @@ +From 1092de02d1ac256a8c56fb5b5e590a4df8188acb Mon Sep 17 00:00:00 2001 +From: Mikko Levonmaa +Date: Tue, 27 Nov 2012 12:46:44 -0800 +Subject: [PATCH] Always build uic + +Even if we are not building gui or widgets. This tool is needed later +as a native tool when compiling the target. + +Signed-off-by: Mikko Levonmaa +--- + src/tools/tools.pro | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/tools/tools.pro b/src/tools/tools.pro +index c67d6bf..b6f3b39 100644 +--- a/src/tools/tools.pro ++++ b/src/tools/tools.pro +@@ -1,8 +1,8 @@ + TEMPLATE = subdirs + +-TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc ++TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc src_tools_uic + contains(QT_CONFIG, dbus): TOOLS_SUBDIRS += src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml +-!contains(QT_CONFIG, no-widgets): TOOLS_SUBDIRS += src_tools_uic ++ + # Set subdir and respective target name + src_tools_bootstrap.subdir = $$PWD/bootstrap + src_tools_bootstrap.target = sub-tools-bootstrap +-- +1.7.4.1 + diff --git a/recipes-qt/qt5/qtbase/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch b/recipes-qt/qt5/qtbase/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch new file mode 100644 index 00000000..6c9affae --- /dev/null +++ b/recipes-qt/qt5/qtbase/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch @@ -0,0 +1,31 @@ +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,11 @@ qmakeAddCacheClear(qmakeCacheClearFunc func, void **data) + + QString qt_libraryInfoFile() + { ++ QString qtconfig = QFile::decodeName(getenv("QT_CONF_PATH")); ++ if (QFile::exists(qtconfig)) { ++ printf("Overriding with qt.conf from: %s\n", qtconfig.toLatin1().data()); ++ 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 + -- cgit v1.2.3-54-g00ecf