summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-05-28 11:48:09 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-05-28 15:25:25 +0200
commitf8b065ea1174dd1fa7d93359f6826bfc9d23174c (patch)
tree2da2a4be9b5aff64e54a818a19a8939266eed05f /recipes-qt/qt5/qtbase/0001-Always-build-uic.patch
parentf52b59a5cc9ddfb0ede39194e284c858bfd0cbd8 (diff)
downloadmeta-qt5-f8b065ea1174dd1fa7d93359f6826bfc9d23174c.tar.gz
qt5: drop 5.0.0 and 5.0.1 versions
* maintaining 4 different versions requires a lot more testing of changes in .inc files and we have only one version of modules without release (only one _git.bb) and it's impossible to find SRCREV which would be compatible with all 4 versions. * 0005-AddSynchoronization-qimagereader.patch was already backported to 5.0.2 in upstream * 0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch was already applied in 5.0.2 * 5.0.2 is now default version (based on DEFAULT_PREFERENCE and in qt5-versions.inc Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0001-Always-build-uic.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0001-Always-build-uic.patch31
1 files changed, 0 insertions, 31 deletions
diff --git a/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch
deleted file mode 100644
index 3f2e3fd9..00000000
--- a/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 1092de02d1ac256a8c56fb5b5e590a4df8188acb Mon Sep 17 00:00:00 2001
2From: Mikko Levonmaa <mikko.levonmaa@palm.com>
3Date: Tue, 27 Nov 2012 12:46:44 -0800
4Subject: [PATCH] Always build uic
5
6Even if we are not building gui or widgets. This tool is needed later
7as a native tool when compiling the target.
8
9Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
10---
11 src/tools/tools.pro | 4 ++--
12 1 files changed, 2 insertions(+), 2 deletions(-)
13
14diff --git a/src/tools/tools.pro b/src/tools/tools.pro
15index c67d6bf..b6f3b39 100644
16--- a/src/tools/tools.pro
17+++ b/src/tools/tools.pro
18@@ -1,8 +1,8 @@
19 TEMPLATE = subdirs
20
21-TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc
22+TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc src_tools_uic
23 contains(QT_CONFIG, dbus): TOOLS_SUBDIRS += src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
24-!contains(QT_CONFIG, no-widgets): TOOLS_SUBDIRS += src_tools_uic
25+
26 # Set subdir and respective target name
27 src_tools_bootstrap.subdir = $$PWD/bootstrap
28 src_tools_bootstrap.target = sub-tools-bootstrap
29--
301.7.4.1
31