diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-02-09 17:38:21 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-28 12:27:45 +0000 |
commit | 0733f7a4a948d23afb87a8dc1acf8327c0e91aa0 (patch) | |
tree | ca6c446a4d3367841383f1e925d5588c58ea2021 /meta/recipes-qt/qt4/files | |
parent | afc6d1bb31a1f28358245a5b2331e999e62bc594 (diff) | |
download | poky-0733f7a4a948d23afb87a8dc1acf8327c0e91aa0.tar.gz |
qt4-tools-nativesdk: improve and tidy up qmake build
* Use the same method to build qmake as in the qt4 target recipes
* We always have qmake from qt4-native so don't check if it exists -
just skip the check like we do in the qt4 target recipes. This
saves us a patch.
* Replace qt4-tools-native in DEPENDS with qt4-native
(From OE-Core rev: 71153270466352245fe2aa3318bbabb1f8062ed2)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/files')
-rw-r--r-- | meta/recipes-qt/qt4/files/qmake-exists-check.patch | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/meta/recipes-qt/qt4/files/qmake-exists-check.patch b/meta/recipes-qt/qt4/files/qmake-exists-check.patch deleted file mode 100644 index 27d21e045b..0000000000 --- a/meta/recipes-qt/qt4/files/qmake-exists-check.patch +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | qt4-tools-nativesdk: avoid rebuilding qmake | ||
2 | |||
3 | qt4-tools-nativesdk patch to avoids building qmake in configure if it already exists | ||
4 | (as it will, since we symlink it in from the native sysroot in do_configure) | ||
5 | |||
6 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
7 | Upstream-Status: Inappropriate [configuration] | ||
8 | |||
9 | --- qt-everywhere-opensource-src-4.6.3.orig/configure 2011-01-10 12:01:56.260607001 +0000 | ||
10 | +++ qt-everywhere-opensource-src-4.6.3/configure 2011-01-10 12:02:20.584607015 +0000 | ||
11 | @@ -4286,7 +4286,7 @@ | ||
12 | } | ||
13 | |||
14 | # build qmake | ||
15 | -if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | ||
16 | +if [ '!' -f "$outpath/bin/qmake" ]; then | ||
17 | echo "Creating qmake. Please wait..." | ||
18 | |||
19 | OLD_QCONFIG_H= | ||