From 3442aad5295956c1a177bdf7ab73e1f0d86ab5fc Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Mon, 29 Oct 2012 20:07:49 -0700
Subject: [PATCH 08/10] 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.pri | 3 ++-
 qmake/qmake.pro | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)
---
 configure       | 2 +-
 qmake/qmake.pri | 3 ++-
 qmake/qmake.pro | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index f0f42ab..6f338f3 100755
--- a/configure
+++ b/configure
@@ -3942,7 +3942,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.pri b/qmake/qmake.pri
index 782151d..4b314a8 100644
--- a/qmake/qmake.pri
+++ b/qmake/qmake.pri
@@ -80,7 +80,8 @@ bootstrap { #Qt code
         qjsonparser.cpp \
         qjsonarray.cpp \
         qjsonobject.cpp \
-        qjsonvalue.cpp
+        qjsonvalue.cpp \
+        qdebug.cpp
 
    HEADERS+= \
         qbitarray.h \
diff --git a/qmake/qmake.pro b/qmake/qmake.pro
index 89d6ea5..0ff4a96 100644
--- a/qmake/qmake.pro
+++ b/qmake/qmake.pro
@@ -8,6 +8,7 @@ CONFIG -= qt
 DEFINES += \
     QT_BUILD_QMAKE \
     PROEVALUATOR_FULL
+TARGET = qmake
 
 VPATH += \
     ../src/corelib/global \
-- 
2.6.1