diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-11-27 15:48:20 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-07 13:40:14 +0000 |
| commit | 8b11ed8a75a15328bbd22d100a976cc669b84b58 (patch) | |
| tree | 9b93d0fcd8fd973943ca61f126cae47066113922 /meta/recipes-qt/qt4/qt4-4.8.7/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch | |
| parent | 0baadc8a98daa14090b04e728fb5a44af3f545c8 (diff) | |
| download | poky-8b11ed8a75a15328bbd22d100a976cc669b84b58.tar.gz | |
qt4: remove recipes and classes
Qt4 is no longer supportd upstream, but it is still needed for LSB compliancy.
Qt4 recipes have been moved to a separate meta-qt4 layer to be consistent with
meta-qt3 and meta-qt5.
(From OE-Core rev: cb89d2b25b4edb1241bc5426a69a6bc44df9be2c)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.7/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.7/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch deleted file mode 100644 index 1eb8a5843a..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.7/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | From af699c6e8cf9fb28d6f8b789bf33d53b47edaec7 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Michael Krelin <hacker@klever.net> | ||
| 3 | Date: Wed, 26 Sep 2012 20:24:20 +0200 | ||
| 4 | Subject: [PATCH 04/21] configure: qmake is already built in qt4-tools-native, | ||
| 5 | so disable it | ||
| 6 | |||
| 7 | Upstream-Status: Inappropriate [configuration] | ||
| 8 | |||
| 9 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 10 | --- | ||
| 11 | configure | 2 +- | ||
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/configure b/configure | ||
| 15 | index e3d464b..cc04b27 100755 | ||
| 16 | --- a/configure | ||
| 17 | +++ b/configure | ||
| 18 | @@ -4899,7 +4899,7 @@ setBootstrapVariable() | ||
| 19 | } | ||
| 20 | |||
| 21 | # build qmake | ||
| 22 | -if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | ||
| 23 | +if false; then ###[ '!' -f "$outpath/bin/qmake" ]; | ||
| 24 | echo "Creating qmake. Please wait..." | ||
| 25 | |||
| 26 | OLD_QCONFIG_H= | ||
| 27 | -- | ||
| 28 | 1.8.0 | ||
| 29 | |||
