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/qtbase-native.inc | |
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/qtbase-native.inc')
-rw-r--r-- | recipes-qt/qt5/qtbase-native.inc | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index 1adf422e..b9193e4e 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc | |||
@@ -7,28 +7,24 @@ QT_MODULE = "qtbase" | |||
7 | 7 | ||
8 | require qt5-native.inc | 8 | require qt5-native.inc |
9 | 9 | ||
10 | # shared with target qtbase, all except | 10 | # common with target version |
11 | # 0005-qmake-is-already-built-in-qtbase-native.patch | 11 | # common with -native and target version |
12 | # 0006-Allow-building-a-separate-qmake-for-the-target.patch | 12 | SRC_URI += "\ |
13 | |||
14 | SRC_URI += " \ | ||
15 | file://0001-Add-linux-oe-g-platform.patch \ | 13 | file://0001-Add-linux-oe-g-platform.patch \ |
16 | file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ | 14 | file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ |
17 | file://0003-Add-external-hostbindir-option.patch \ | 15 | file://0003-Add-external-hostbindir-option.patch \ |
18 | file://0004-qt_functions-temporary-remove-isEmpty-check.patch \ | 16 | file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ |
19 | file://0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ | 17 | file://0005-qt_module-Fix-pkgconfig-replacement.patch \ |
20 | file://0008-qt_module-Fix-pkgconfig-replacement.patch \ | 18 | file://0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ |
21 | file://0009-qt_module-Fix-paths-in-.prl-files.patch \ | 19 | file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ |
22 | file://0010-wayland-scanner-disable-silent-rules.patch \ | 20 | file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \ |
23 | file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ | 21 | file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \ |
24 | file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ | ||
25 | file://0013-Disable-mkv8snapshot.patch \ | ||
26 | file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \ | ||
27 | file://0015-qtbase-allow-build-of-examples.patch \ | ||
28 | " | 22 | " |
29 | 23 | ||
30 | # specific for native version | 24 | # specific for native version |
31 | SRC_URI += "file://0001-Always-build-uic.patch" | 25 | SRC_URI += " \ |
26 | file://0010-Always-build-uic.patch \ | ||
27 | " | ||
32 | 28 | ||
33 | QT_CONF_PATH = "${B}/qt.conf" | 29 | QT_CONF_PATH = "${B}/qt.conf" |
34 | 30 | ||