diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-11-02 19:06:14 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-01-12 15:01:37 +0100 |
commit | c908fe4ebd5a04813be0b83c173fae182bb22728 (patch) | |
tree | ac8f089c2dce89598cf96532eac24cfb33567e4b /recipes-qt/qt5/qtwayland | |
parent | 775d77e482f1ea203c78003cccd2547075fd720f (diff) | |
download | meta-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/qtwayland')
-rw-r--r-- | recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch | 32 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwayland/fix.missing.v8.public.api.patch | 30 |
2 files changed, 32 insertions, 30 deletions
diff --git a/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch new file mode 100644 index 00000000..1fac95b7 --- /dev/null +++ b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 761367755efa529c41ba414521eaed0b10873d99 Mon Sep 17 00:00:00 2001 | ||
2 | From: Simon Busch <morphis@gravedo.de> | ||
3 | Date: Fri, 19 Jul 2013 13:35:14 +0000 | ||
4 | Subject: [PATCH] Install the qtwaylandscanner tool to the native side | ||
5 | |||
6 | Upstream-Status: Inappropiate [configuration] | ||
7 | |||
8 | Signed-off-by: Simon Busch <morphis@gravedo.de> | ||
9 | --- | ||
10 | src/qtwaylandscanner/qtwaylandscanner.pro | 8 ++++++-- | ||
11 | 1 file changed, 6 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/src/qtwaylandscanner/qtwaylandscanner.pro b/src/qtwaylandscanner/qtwaylandscanner.pro | ||
14 | index ac2d07b..53b93f9 100644 | ||
15 | --- a/src/qtwaylandscanner/qtwaylandscanner.pro | ||
16 | +++ b/src/qtwaylandscanner/qtwaylandscanner.pro | ||
17 | @@ -1,6 +1,10 @@ | ||
18 | option(host_build) | ||
19 | |||
20 | -SOURCES += qtwaylandscanner.cpp | ||
21 | +TARGET = qtwaylandscanner$$qtPlatformTargetSuffix() | ||
22 | +CONFIG += console warn_off | ||
23 | +QT = core | ||
24 | |||
25 | -load(qt_tool) | ||
26 | +SOURCES += qtwaylandscanner.cpp | ||
27 | |||
28 | +target.path = $$[QT_HOST_BINS] | ||
29 | +INSTALLS += target | ||
30 | -- | ||
31 | 1.8.1.2 | ||
32 | |||
diff --git a/recipes-qt/qt5/qtwayland/fix.missing.v8.public.api.patch b/recipes-qt/qt5/qtwayland/fix.missing.v8.public.api.patch deleted file mode 100644 index 6bbbaa1e..00000000 --- a/recipes-qt/qt5/qtwayland/fix.missing.v8.public.api.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From b455f5acaec811b70ae3eb896c08a634909cb9d1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Carsten Munk <carsten.munk@jollamobile.com> | ||
3 | Date: Wed, 17 Jul 2013 07:28:04 +0000 | ||
4 | Subject: [PATCH] Fix Project ERROR: Module v8 has no public API. make[1]: *** | ||
5 | [sub-qml-compositor-make_first] Error 3 | ||
6 | |||
7 | Cherry-picked from: | ||
8 | https://github.com/kvahlman/qtwayland/commit/b455f5acaec811b70ae3eb896c08a634909cb9d1 | ||
9 | |||
10 | Signed-off-by: Carsten Munk <carsten.munk@jollamobile.com> | ||
11 | --- | ||
12 | qtwayland/examples/qml-compositor/qml-compositor.pro | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/examples/qml-compositor/qml-compositor.pro b/examples/qml-compositor/qml-compositor.pro | ||
16 | index 0bc0b02..e397002 100644 | ||
17 | --- a/examples/qml-compositor/qml-compositor.pro | ||
18 | +++ b/examples/qml-compositor/qml-compositor.pro | ||
19 | @@ -2,7 +2,7 @@ DEFINES += QT_COMPOSITOR_QUICK | ||
20 | |||
21 | LIBS += -L ../../lib | ||
22 | |||
23 | -QT += quick qml v8 | ||
24 | +QT += quick qml | ||
25 | QT += quick-private | ||
26 | |||
27 | QT += compositor | ||
28 | -- | ||
29 | 1.8.4 | ||
30 | |||