From 35ccafd9c533c423aa7985ec2ce7f0512283c154 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 21 May 2013 22:16:06 +0200 Subject: qtbase: refresh patches, drop 2 unused * drop Change-Ids, add Upstream-Status * 0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch was rejected upstream, 0007 was only in meta-qt5/qtbase repo, but wasn't used in recipes * 0004-Disable-mkv8snapshot.patch and 0005-AddSynchoronization-qimagereader.patch are special, because they are applied only to 5.0.0 Signed-off-by: Martin Jansa --- ...-building-a-separate-qmake-for-the-target.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch (limited to 'recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch') diff --git a/recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch new file mode 100644 index 00000000..c639c172 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch @@ -0,0 +1,29 @@ +From 892351a55c3f6a033a1823e104315cb0f03b454d Mon Sep 17 00:00:00 2001 +From: Paul Eggleton +Date: Mon, 29 Oct 2012 20:26:36 -0700 +Subject: [PATCH 06/12] Allow building a separate qmake for the target + +Upstream-Status: Inappropriate [config] + +Signed-off-by: Paul Eggleton +Signed-off-by: Mikko Levonmaa +Signed-off-by: Martin Jansa +--- + qmake/qmake.pro | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/qmake/qmake.pro b/qmake/qmake.pro +index 0d92ac2..9be0e9b 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 = qmake + + OBJECTS_DIR = . + MOC_DIR = . +-- +1.8.2.1 + -- cgit v1.2.3-54-g00ecf