summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-05-30 14:37:26 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-06-10 12:11:51 +0200
commitcf2c7816fd053ff16a41abdc6f2a89fe9ff7a7ff (patch)
treea9bd7e40b22d3ccf789a0506a4c2fc7c30593d6f /recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
parenta0da57e5ce2862758e10b82c30c200e365b29f46 (diff)
downloadmeta-qt5-cf2c7816fd053ff16a41abdc6f2a89fe9ff7a7ff.tar.gz
recipes-git: Upgrade to latest origin/stable
* qtbase: Fix undefined reference to qt_blend_argb32_on_argb32_ssse3 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch')
-rw-r--r--recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch50
1 files changed, 0 insertions, 50 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
deleted file mode 100644
index 395e84cc..00000000
--- a/recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From c0c4c468cc70a367e3bb2dd4a48c31e62b3b0fa4 Mon Sep 17 00:00:00 2001
2From: Michael Krelin <hacker@klever.net>
3Date: Mon, 29 Oct 2012 20:07:49 -0700
4Subject: [PATCH 05/10] qmake: don't build it in configure, but allow to build
5 it separately
6
7* it is already built in qtbase-native, so we don't need it in configure
8* allow building a separate qmake for the target
9
10Upstream-Status: Inappropriate [configuration]
11 OE specific for native/target builds
12
13Signed-off-by: Yu Ke <ke.yu@intel.com>
14Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
15Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17---
18 configure | 2 +-
19 qmake/qmake.pro | 2 ++
20 2 files changed, 3 insertions(+), 1 deletion(-)
21
22diff --git a/configure b/configure
23index bf7c11e..5e93ce4 100755
24--- a/configure
25+++ b/configure
26@@ -3674,7 +3674,7 @@ setBootstrapEvalVariable()
27
28
29 # build qmake
30-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
31+if false; then ###[ '!' -f "$outpath/bin/qmake" ];
32 echo "Creating qmake..."
33
34 mkdir -p "$outpath/qmake" || exit
35diff --git a/qmake/qmake.pro b/qmake/qmake.pro
36index 89d6ea5..7c605b9 100644
37--- a/qmake/qmake.pro
38+++ b/qmake/qmake.pro
39@@ -8,6 +8,8 @@ CONFIG -= qt
40 DEFINES += \
41 QT_BUILD_QMAKE \
42 PROEVALUATOR_FULL
43+DESTDIR = ../bin/
44+TARGET = qmake
45
46 VPATH += \
47 ../src/corelib/global \
48--
491.9.1
50