2013-07-20 13:13:32 +00:00
|
|
|
From 33e87dae3b9dc4007c7cddd82a1b9058010a1992 Mon Sep 17 00:00:00 2001
|
2013-04-03 11:08:50 +00:00
|
|
|
From: Michael Krelin <hacker@klever.net>
|
|
|
|
Date: Mon, 29 Oct 2012 20:07:49 -0700
|
2013-07-20 13:13:32 +00:00
|
|
|
Subject: [PATCH 05/23] qmake is already built in qtbase-native
|
2013-04-03 11:08:50 +00:00
|
|
|
|
|
|
|
Ported from OE by: Yu Ke <ke.yu@intel.com>
|
|
|
|
Upstream-Status: Inappropriate [configuration]
|
|
|
|
|
|
|
|
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
|
|
|
|
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
|
|
|
---
|
|
|
|
configure | 2 +-
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
diff --git a/configure b/configure
|
2013-07-20 13:13:32 +00:00
|
|
|
index 25980c0..74f9e65 100755
|
2013-04-03 11:08:50 +00:00
|
|
|
--- a/configure
|
|
|
|
+++ b/configure
|
2013-07-20 13:13:32 +00:00
|
|
|
@@ -4022,7 +4022,7 @@ setBootstrapEvalVariable()
|
2013-04-03 11:08:50 +00:00
|
|
|
|
|
|
|
|
|
|
|
# build qmake
|
|
|
|
-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
|
|
|
|
+if false; then ###[ '!' -f "$outpath/bin/qmake" ];
|
|
|
|
echo "Creating qmake..."
|
|
|
|
|
|
|
|
mkdir -p "$outpath/qmake" || exit
|
|
|
|
--
|
2013-07-20 13:13:32 +00:00
|
|
|
1.8.3.2
|
2013-04-03 11:08:50 +00:00
|
|
|
|