aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
blob: 21e0987bf867e69881b68785f1aaf40bc79b6ea6 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
From ee542556da221be99fa3344630b78529555be2bc Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Mon, 29 Oct 2012 20:07:49 -0700
Subject: [PATCH 11/11] 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 <ke.yu@intel.com>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 configure       | 2 +-
 qmake/qmake.pro | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index bd43281..5d1b3aa 100755
--- a/configure
+++ b/configure
@@ -3724,7 +3724,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.1.3