summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-05-28 12:47:20 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-05-28 15:25:53 +0200
commit1496c6ba34bf95bce67504c72edace1bc2c0a64e (patch)
treeb2f16ae4f756fcfd5b645d29c2a815af94cd89d9 /recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch
parentf8b065ea1174dd1fa7d93359f6826bfc9d23174c (diff)
downloadmeta-qt5-1496c6ba34bf95bce67504c72edace1bc2c0a64e.tar.gz
qtbase: refresh patches
* all patches applied in recipes should be also applied in https://github.com/meta-qt5/qtbase branches to make it easier to upgrade to new version without loosing any patches * apply: 0013-Disable-mkv8snapshot.patch 0014-enables-tslib-device-to-be-read-from-env-variable.patch 0015-qtbase-allow-build-of-examples.patch also for git version, only 0016-configure-add-tslib-support.patch is now 5.0.2 specific (similar patch already applied in stable branch) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch')
-rw-r--r--recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch
index febefb8a..d95e0b45 100644
--- a/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch
+++ b/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch
@@ -1,7 +1,7 @@
1From f42c4156c3e056e9fd2d6b0542662d705efb2722 Mon Sep 17 00:00:00 2001 1From f42c4156c3e056e9fd2d6b0542662d705efb2722 Mon Sep 17 00:00:00 2001
2From: Michael Krelin <hacker@klever.net> 2From: Michael Krelin <hacker@klever.net>
3Date: Mon, 29 Oct 2012 20:07:49 -0700 3Date: Mon, 29 Oct 2012 20:07:49 -0700
4Subject: [PATCH 05/12] qmake is already built in qtbase-native 4Subject: [PATCH 05/15] qmake is already built in qtbase-native
5 5
6Ported from OE by: Yu Ke <ke.yu@intel.com> 6Ported from OE by: Yu Ke <ke.yu@intel.com>
7Upstream-Status: Inappropriate [configuration] 7Upstream-Status: Inappropriate [configuration]