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 --- ...g-calculation-of-viewPort-for-transitions.patch | 41 ---------------------- 1 file changed, 41 deletions(-) delete mode 100644 recipes-qt/qt5/qtdeclarative-git/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch (limited to 'recipes-qt/qt5/qtdeclarative-git/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch') diff --git a/recipes-qt/qt5/qtdeclarative-git/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative-git/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch deleted file mode 100644 index 84f8f661..00000000 --- a/recipes-qt/qt5/qtdeclarative-git/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 3919fe89e7adbc9f163eabce9269a924273c64ec Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20H=C3=A4nel?= -Date: Wed, 5 Jun 2013 19:23:32 +0200 -Subject: [PATCH 2/2] Fix wrong calculation of viewPort for transitions - -Viewport is calculated wrong for horizontal layout in a second instance - -Task-number: QTBUG-29944 -Task-Number: QTBUG-31546 - -Upstream-Status: Pending - -Looks like backport of https://codereview.qt-project.org/49226 but this -one was applied in previous patch, this change looks the same but is -in different part of qquickitemview.cpp and ISN'T applied yet in dev -branch. - -Signed-off-by: Florian Haenel -Signed-off-by: Martin Jansa - -Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe ---- - src/quick/items/qquickitemview.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp -index a6dabee..290f283 100644 ---- a/src/quick/items/qquickitemview.cpp -+++ b/src/quick/items/qquickitemview.cpp -@@ -1815,7 +1815,7 @@ void QQuickItemViewPrivate::layout() - - prepareVisibleItemTransitions(); - -- QRectF viewBounds(0, position(), q->width(), q->height()); -+ QRectF viewBounds(q->contentX(), q->contentY(), q->width(), q->height()); - for (QList::Iterator it = releasePendingTransition.begin(); - it != releasePendingTransition.end(); ) { - FxViewItem *item = *it; --- -1.8.3.2 - -- cgit v1.2.3-54-g00ecf