summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-11-02 19:06:14 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-01-12 15:01:37 +0100
commitc908fe4ebd5a04813be0b83c173fae182bb22728 (patch)
treeac8f089c2dce89598cf96532eac24cfb33567e4b /recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch
parent775d77e482f1ea203c78003cccd2547075fd720f (diff)
downloadmeta-qt5-c908fe4ebd5a04813be0b83c173fae182bb22728.tar.gz
qt5: upgrade to 5.2.0
* drop 0027-Fix-misaligned-selection-region-with-text-when-cente.patch resolved in upstream commit 5d8a882c11201a29475c5ea71cfb76c9de6573f5 * drop 0020-Use-BGRA-extension-in-bindTexture.patch resolved in upstream commit e1325cf26e146b68725cc1a0a02b274ce3dfbe5c * drop 0008-wayland-scanner-disable-silent-rules.patch resolved upstream in: commit 2ff2a7c32d76b9e58b800f12469f112cfdb6ad3c Author: Jan Arne Petersen <jan.petersen@kdab.com> Date: Fri Jul 19 14:35:19 2013 +0200 Fix wayland-scanner to work with CONFIG+=silent * squash to match more with structure of https://github.com/meta-qt5/qtbase/tree/stable * qtmodules: bump SRCREVs for 5.2.0 tags now all modules using qt5-git should be newer than any 5.1.* version * qtbase: fix paths in packageconfig *.pc files include- and lib-paths contained build-sysroot paths * qtwebkit: Explicitly add ICU libraries to LIBS fails to build without this * qtjsbackend: remove for git versions Found in [1]: Qt Qml is now using its own built-in Javascript engine and does not depend on V8 anymore. As such the QtJSBackend shared library has disappeared. [1] http://blog.qt.digia.com/blog/2013/09/30/qt-5-2-alpha-available/ * qt5: Upgrade 5.1.1 recipes to 5.2.0 to match git recipes qtjsbackend is now completely gone it allows to share more .patch files and configuration in .inc again Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch')
-rw-r--r--recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch40
1 files changed, 0 insertions, 40 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch
deleted file mode 100644
index e02815b1..00000000
--- a/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From a911109ed920e6a7466b65df86270ed836dd529c 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
9Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6
10Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 src/src.pro | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/src/src.pro b/src/src.pro
17index b4c9602..f30ec1f 100644
18--- a/src/src.pro
19+++ b/src/src.pro
20@@ -122,7 +122,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
21 contains(QT_CONFIG, opengl(es1|es2)?):SUBDIRS += src_openglextensions
22 src_plugins.depends += src_gui src_platformsupport
23 !contains(QT_CONFIG, no-widgets) {
24- SUBDIRS += src_tools_uic src_widgets
25+ SUBDIRS += src_widgets
26 src_plugins.depends += src_widgets
27 contains(QT_CONFIG, opengl(es1|es2)?) {
28 SUBDIRS += src_opengl
29@@ -134,7 +134,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
30 }
31 }
32 }
33-SUBDIRS += src_plugins src_tools_qdoc
34+SUBDIRS += src_plugins src_tools_qdoc src_tools_uic
35
36 nacl: SUBDIRS -= src_network src_testlib
37
38--
391.8.3.2
40