summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.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/0015-qtbase-allow-build-of-examples.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/0015-qtbase-allow-build-of-examples.patch')
-rw-r--r--recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch48
1 files changed, 0 insertions, 48 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch
deleted file mode 100644
index 9cf06419..00000000
--- a/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From 1936e953e2273c204230c931c0b86b34107340c7 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Sat, 25 May 2013 17:34:32 +0200
4Subject: [PATCH 15/23] qtbase: allow build of examples
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9this revert the following commit :
10
11commit 2b397f985e4ef6ae5c0571a928bb1320fb048c61
12Author: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
13Date: Fri Dec 21 19:36:12 2012 +0100
14
15 do not actually build examples in production builds
16
17 -developer-build enables an actual build of examples, based on the
18 assumption that developers want to test it (it can be still disabled
19 with -nomake examples). regular users otoh want only the examples
20 sources installed.
21
22 Change-Id: Ifc6a108099929175a3960480802b271a758fdd38
23 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
24
25Signed-off-by: Eric Bénard <eric@eukrea.com>
26---
27 mkspecs/features/qt_example_installs.prf | 7 -------
28 1 file changed, 7 deletions(-)
29
30diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
31index 2db752c..ca1b0c7 100644
32--- a/mkspecs/features/qt_example_installs.prf
33+++ b/mkspecs/features/qt_example_installs.prf
34@@ -92,11 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
35 allfiles -= doc
36 !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles")
37 }
38-
39- !equals(TEMPLATE, subdirs):!compile_examples {
40- TEMPLATE = aux
41- CONFIG -= have_target qt staticlib dll
42- SOURCES =
43- INSTALLS -= target
44- }
45 }
46--
471.8.3.2
48