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 --- ...w-to-build-only-lrelease-lupdate-lconvert.patch | 138 --------------------- 1 file changed, 138 deletions(-) delete mode 100644 recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch (limited to 'recipes-qt/qt5/qttools-git') diff --git a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch deleted file mode 100644 index b1145be1..00000000 --- a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch +++ /dev/null @@ -1,138 +0,0 @@ -From 3a1d11f3391d7745a01a68629d04f8b5b3c40ffb Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 11 Sep 2013 18:30:08 +0200 -Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert - -This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native -is built without GUI support (no-png is set) and we still want to build -native lrelease + lupdate + lconvert tools. - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa ---- - examples/examples.pro | 4 ++-- - src/designer/src/src.pro | 16 +++++++++------- - src/linguist/linguist.pro | 2 +- - src/src.pro | 10 ++++++---- - tests/auto/auto.pro | 22 ++++++++++++---------- - 5 files changed, 30 insertions(+), 24 deletions(-) - -diff --git a/examples/examples.pro b/examples/examples.pro -index 4955969..8e86419 100644 ---- a/examples/examples.pro -+++ b/examples/examples.pro -@@ -1,3 +1,3 @@ - TEMPLATE = subdirs --qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant -- -+!linguistonly:qtHaveModule(widgets): SUBDIRS += help designer assistant -+qtHaveModule(widgets): SUBDIRS += linguist uitools -diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro -index e02ca8e..49527c5 100644 ---- a/src/designer/src/src.pro -+++ b/src/designer/src/src.pro -@@ -1,18 +1,20 @@ - TEMPLATE = subdirs - --SUBDIRS = \ -- uitools \ -- lib \ -- components \ -- designer -+!linguistonly { -+ SUBDIRS = \ -+ lib \ -+ components \ -+ designer -+} -+SUBDIRS += uitools - --contains(QT_CONFIG, shared): SUBDIRS += plugins -+!linguistonly:contains(QT_CONFIG, shared): SUBDIRS += plugins - - components.depends = lib - designer.depends = components - plugins.depends = lib - --qtNomakeTools( \ -+!linguistonly:qtNomakeTools( \ - lib \ - components \ - designer \ -diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro -index df3c0c7..75bdf26 100644 ---- a/src/linguist/linguist.pro -+++ b/src/linguist/linguist.pro -@@ -3,7 +3,7 @@ SUBDIRS = \ - lrelease \ - lupdate \ - lconvert --!no-png:qtHaveModule(widgets): SUBDIRS += linguist -+!linguistonly:!no-png:qtHaveModule(widgets): SUBDIRS += linguist - - qtNomakeTools( \ - linguist \ -diff --git a/src/src.pro b/src/src.pro -index c8756db..d71c4a0 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -4,10 +4,12 @@ qtHaveModule(widgets) { - no-png { - message("Some graphics-related tools are unavailable without PNG support") - } else { -- SUBDIRS = assistant \ -+ !linguistonly { -+ SUBDIRS = assistant \ - pixeltool \ -- qtestlib \ -- designer -+ qtestlib -+ } -+ SUBDIRS += designer - # unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig - - linguist.depends = designer -@@ -20,7 +22,7 @@ mac { - SUBDIRS += macdeployqt - } - --qtHaveModule(dbus): SUBDIRS += qdbus -+!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus - - qtNomakeTools( \ - pixeltool \ -diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro -index eaf440b..1778ad1 100644 ---- a/tests/auto/auto.pro -+++ b/tests/auto/auto.pro -@@ -1,14 +1,16 @@ - TEMPLATE=subdirs --SUBDIRS=\ -- linguist \ -- host.pro \ -- qhelpcontentmodel \ -- qhelpenginecore \ -- qhelpgenerator \ -- qhelpindexmodel \ -- qhelpprojectdata \ -- cmake \ -- installed_cmake -+!linguistonly { -+ SUBDIRS=\ -+ linguist \ -+ host.pro \ -+ qhelpcontentmodel \ -+ qhelpenginecore \ -+ qhelpgenerator \ -+ qhelpindexmodel \ -+ qhelpprojectdata \ -+ cmake \ -+ installed_cmake -+} - - installed_cmake.depends = cmake - --- -1.8.3.2 - -- cgit v1.2.3-54-g00ecf