From d750936020f354b8c59bbfcbf3930115c390d36d Mon Sep 17 00:00:00 2001 From: Michael Krelin 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 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 3f05383..05ae996 100755 --- a/configure +++ b/configure @@ -3718,7 +3718,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.1