meta-qt5/recipes-qt/qt5/qtbase/0012-qmake-don-t-build-it-in-configure-but-allow-to-build.patch

   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
   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
  10 Upstream-Status: Inappropriate [configuration]
  11   OE specific for native/target builds
  12
  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>
  17 ---
  18  configure       | 2 +-
  19  qmake/qmake.pro | 2 ++
  20  2 files changed, 3 insertions(+), 1 deletion(-)
  21
  22 diff --git a/configure b/configure
  23 index ca0824f..5a09ae3 100755
  24 --- a/configure
  25 +++ b/configure
  26 @@ -3675,7 +3675,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
  35 diff --git a/qmake/qmake.pro b/qmake/qmake.pro
  36 index 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 --
  49 2.1.1
  50