From c908fe4ebd5a04813be0b83c173fae182bb22728 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 2 Nov 2013 19:06:14 +0100 Subject: qt5: upgrade to 5.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 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 Signed-off-by: Martin Jansa --- conf/distro/include/qt5-versions.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc index 7e2d76ef..3e33af02 100644 --- a/conf/distro/include/qt5-versions.inc +++ b/conf/distro/include/qt5-versions.inc @@ -1,7 +1,7 @@ # Select which version you prefer by defining QT5_VERSION and including this file -# possible values now "5.1.1", "5.1.0+git%" +# possible values now "5.2.0", "5.2.0+git%" -QT5_VERSION ?= "5.1.1" +QT5_VERSION ?= "5.2.0" PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}" PREFERRED_VERSION_qtbase = "${QT5_VERSION}" @@ -14,6 +14,7 @@ PREFERRED_VERSION_qtmultimedia = "${QT5_VERSION}" PREFERRED_VERSION_qtquick1 = "${QT5_VERSION}" PREFERRED_VERSION_qtquickcontrols = "${QT5_VERSION}" PREFERRED_VERSION_qtsensors = "${QT5_VERSION}" +PREFERRED_VERSION_qtserialport = "${QT5_VERSION}" PREFERRED_VERSION_qtscript = "${QT5_VERSION}" PREFERRED_VERSION_qtsvg = "${QT5_VERSION}" PREFERRED_VERSION_qttools-native = "${QT5_VERSION}" -- cgit v1.2.3