diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-05-28 14:50:37 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-05-28 14:50:37 +0200 |
commit | 3fa7bb148ed40bd018ce51b5f20c0c8792638568 (patch) | |
tree | dc7b2847822189d5c0cbc7195fbca3556d6aa6a2 /recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch | |
parent | 17eb158c6d2cd290b054b5bd54311aa44a02d04d (diff) | |
download | meta-qt5-3fa7bb148ed40bd018ce51b5f20c0c8792638568.tar.gz |
qt5: drop recipes for 5.4.1 version
* we don't plan to keep 2 versions, one from tarballs and one from git
now there is 5.4.2 in git recipes and 5.4.1 tarballs aren't very useful
anymore
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch deleted file mode 100644 index 874bc697..00000000 --- a/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch +++ /dev/null | |||
@@ -1,68 +0,0 @@ | |||
1 | From 7943ec2256163f6049d442ff00f579a5cbff5acc 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 11/13] 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 | configure | 2 +- | ||
18 | qmake/qmake.pri | 3 ++- | ||
19 | qmake/qmake.pro | 2 ++ | ||
20 | 3 files changed, 5 insertions(+), 2 deletions(-) | ||
21 | --- | ||
22 | configure | 2 +- | ||
23 | qmake/qmake.pri | 3 ++- | ||
24 | qmake/qmake.pro | 1 + | ||
25 | 3 files changed, 4 insertions(+), 2 deletions(-) | ||
26 | |||
27 | diff --git a/configure b/configure | ||
28 | index a40d471..8d15f59 100755 | ||
29 | --- a/configure | ||
30 | +++ b/configure | ||
31 | @@ -3724,7 +3724,7 @@ setBootstrapEvalVariable() | ||
32 | |||
33 | |||
34 | # build qmake | ||
35 | -if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | ||
36 | +if false; then ###[ '!' -f "$outpath/bin/qmake" ]; | ||
37 | echo "Creating qmake..." | ||
38 | |||
39 | mkdir -p "$outpath/qmake" || exit | ||
40 | diff --git a/qmake/qmake.pri b/qmake/qmake.pri | ||
41 | index 4de41d6..69982b7 100644 | ||
42 | --- a/qmake/qmake.pri | ||
43 | +++ b/qmake/qmake.pri | ||
44 | @@ -82,7 +82,8 @@ bootstrap { #Qt code | ||
45 | qjsonparser.cpp \ | ||
46 | qjsonarray.cpp \ | ||
47 | qjsonobject.cpp \ | ||
48 | - qjsonvalue.cpp | ||
49 | + qjsonvalue.cpp \ | ||
50 | + qdebug.cpp | ||
51 | |||
52 | HEADERS+= \ | ||
53 | qbitarray.h \ | ||
54 | diff --git a/qmake/qmake.pro b/qmake/qmake.pro | ||
55 | index 89d6ea5..0ff4a96 100644 | ||
56 | --- a/qmake/qmake.pro | ||
57 | +++ b/qmake/qmake.pro | ||
58 | @@ -8,6 +8,7 @@ CONFIG -= qt | ||
59 | DEFINES += \ | ||
60 | QT_BUILD_QMAKE \ | ||
61 | PROEVALUATOR_FULL | ||
62 | +TARGET = qmake | ||
63 | |||
64 | VPATH += \ | ||
65 | ../src/corelib/global \ | ||
66 | -- | ||
67 | 2.3.1 | ||
68 | |||