From b4e270f9e2e5c632f0958af1a5131efb45bcd799 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 4 Jun 2014 17:12:58 +0200 Subject: qtbase: Refresh patches to match with stable* branches on github.com/meta-qt5 Signed-off-by: Martin Jansa --- ...-build-it-in-configure-but-allow-to-build.patch | 50 ---------------------- 1 file changed, 50 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase-git/0006-qmake-don-t-build-it-in-configure-but-allow-to-build.patch (limited to 'recipes-qt/qt5/qtbase-git/0006-qmake-don-t-build-it-in-configure-but-allow-to-build.patch') diff --git a/recipes-qt/qt5/qtbase-git/0006-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase-git/0006-qmake-don-t-build-it-in-configure-but-allow-to-build.patch deleted file mode 100644 index 6d79acb6..00000000 --- a/recipes-qt/qt5/qtbase-git/0006-qmake-don-t-build-it-in-configure-but-allow-to-build.patch +++ /dev/null @@ -1,50 +0,0 @@ -From d8e725cb2c25a443d888fe2652f9039e79ae75ac Mon Sep 17 00:00:00 2001 -From: Michael Krelin -Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 6/8] qmake: don't build it in configure, but allow to build it - separately - -* it is already built in qtbase-native, so we don't need it in configure -* allow building a separate qmake for the target - -Upstream-Status: Inappropriate [configuration] - OE specific for native/target builds - -Signed-off-by: Yu Ke -Signed-off-by: Paul Eggleton -Signed-off-by: Mikko Levonmaa -Signed-off-by: Martin Jansa ---- - configure | 2 +- - qmake/qmake.pro | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure b/configure -index 48d5119..2a42c08 100755 ---- a/configure -+++ b/configure -@@ -3675,7 +3675,7 @@ setBootstrapEvalVariable() - - - # build qmake --if true; then ###[ '!' -f "$outpath/bin/qmake" ]; -+if false; then ###[ '!' -f "$outpath/bin/qmake" ]; - echo "Creating qmake..." - - mkdir -p "$outpath/qmake" || exit -diff --git a/qmake/qmake.pro b/qmake/qmake.pro -index 89d6ea5..7c605b9 100644 ---- a/qmake/qmake.pro -+++ b/qmake/qmake.pro -@@ -8,6 +8,8 @@ CONFIG -= qt - DEFINES += \ - QT_BUILD_QMAKE \ - PROEVALUATOR_FULL -+DESTDIR = ../bin/ -+TARGET = qmake - - VPATH += \ - ../src/corelib/global \ --- -2.0.0 - -- cgit v1.2.3-54-g00ecf