1 From bb0958af49c1ad4d35b6b6b9033cd46eda4a3ac8 Mon Sep 17 00:00:00 2001
2 From: Michael Krelin <hacker@klever.net>
3 Date: Mon, 29 Oct 2012 20:07:49 -0700
4 Subject: [PATCH 12/12] qmake: don't build it in configure, but allow to build
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
10 Upstream-Status: Inappropriate [configuration]
11 OE specific for native/target builds
13 Signed-off-by: Yu Ke <ke.yu@intel.com>
14 Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
15 Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
16 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
19 qmake/qmake.pro | 2 ++
20 2 files changed, 3 insertions(+), 1 deletion(-)
22 diff --git a/configure b/configure
23 index ca0824f..5a09ae3 100755
26 @@ -3675,7 +3675,7 @@ setBootstrapEvalVariable()
30 -if true; then ###[ '!' -f "$outpath/bin/qmake" ];
31 +if false; then ###[ '!' -f "$outpath/bin/qmake" ];
32 echo "Creating qmake..."
34 mkdir -p "$outpath/qmake" || exit
35 diff --git a/qmake/qmake.pro b/qmake/qmake.pro
36 index 89d6ea5..7c605b9 100644
39 @@ -8,6 +8,8 @@ CONFIG -= qt
47 ../src/corelib/global \