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/qtdeclarative | |
| 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/qtdeclarative')
| -rw-r--r-- | recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch | 46 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch | 41 |
2 files changed, 87 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch new file mode 100644 index 00000000..7a68dd53 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch | |||
| @@ -0,0 +1,46 @@ | |||
| 1 | From ea698b0a2588585356d1ea5139ca6feb7110611a Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> | ||
| 3 | Date: Sun, 26 May 2013 14:26:19 +0200 | ||
| 4 | Subject: [PATCH 1/3] qmltestexample: fix link | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | else we get : | ||
| 10 | ld: warning: libQt5Quick.so.5, needed by libQt5QuickTest.so, not found | ||
| 11 | |||
| 12 | Upstream-Status: Inappropriate | ||
| 13 | |||
| 14 | Signed-off-by: Eric Bénard <eric@eukrea.com> | ||
| 15 | --- | ||
| 16 | examples/qmltest/qmltest/qmltest.pro | 2 +- | ||
| 17 | tools/qmltestrunner/qmltestrunner.pro | 2 +- | ||
| 18 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 19 | |||
| 20 | diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro | ||
| 21 | index b5893c5..1b00e6c 100644 | ||
| 22 | --- a/examples/qmltest/qmltest/qmltest.pro | ||
| 23 | +++ b/examples/qmltest/qmltest/qmltest.pro | ||
| 24 | @@ -14,7 +14,7 @@ TESTDATA += tst_basic.qml tst_item.qml | ||
| 25 | # This code exists solely for the purpose of building this example | ||
| 26 | # inside the examples/ hierarchy. | ||
| 27 | |||
| 28 | -QT += qml qmltest | ||
| 29 | +QT += qml qmltest quick | ||
| 30 | |||
| 31 | macx: CONFIG -= app_bundle | ||
| 32 | |||
| 33 | diff --git a/tools/qmltestrunner/qmltestrunner.pro b/tools/qmltestrunner/qmltestrunner.pro | ||
| 34 | index 5184c1f..668cf17 100644 | ||
| 35 | --- a/tools/qmltestrunner/qmltestrunner.pro | ||
| 36 | +++ b/tools/qmltestrunner/qmltestrunner.pro | ||
| 37 | @@ -1,5 +1,5 @@ | ||
| 38 | SOURCES += main.cpp | ||
| 39 | |||
| 40 | -QT += qml qmltest | ||
| 41 | +QT += qml qmltest quick | ||
| 42 | |||
| 43 | load(qt_tool) | ||
| 44 | -- | ||
| 45 | 1.8.3.2 | ||
| 46 | |||
diff --git a/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch new file mode 100644 index 00000000..84f8f661 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch | |||
| @@ -0,0 +1,41 @@ | |||
| 1 | From 3919fe89e7adbc9f163eabce9269a924273c64ec Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@basyskom.com> | ||
| 3 | Date: Wed, 5 Jun 2013 19:23:32 +0200 | ||
| 4 | Subject: [PATCH 2/2] Fix wrong calculation of viewPort for transitions | ||
| 5 | |||
| 6 | Viewport is calculated wrong for horizontal layout in a second instance | ||
| 7 | |||
| 8 | Task-number: QTBUG-29944 | ||
| 9 | Task-Number: QTBUG-31546 | ||
| 10 | |||
| 11 | Upstream-Status: Pending | ||
| 12 | |||
| 13 | Looks like backport of https://codereview.qt-project.org/49226 but this | ||
| 14 | one was applied in previous patch, this change looks the same but is | ||
| 15 | in different part of qquickitemview.cpp and ISN'T applied yet in dev | ||
| 16 | branch. | ||
| 17 | |||
| 18 | Signed-off-by: Florian Haenel <florian.haenel@lge.com> | ||
| 19 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 20 | |||
| 21 | Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe | ||
| 22 | --- | ||
| 23 | src/quick/items/qquickitemview.cpp | 2 +- | ||
| 24 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 25 | |||
| 26 | diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp | ||
| 27 | index a6dabee..290f283 100644 | ||
| 28 | --- a/src/quick/items/qquickitemview.cpp | ||
| 29 | +++ b/src/quick/items/qquickitemview.cpp | ||
| 30 | @@ -1815,7 +1815,7 @@ void QQuickItemViewPrivate::layout() | ||
| 31 | |||
| 32 | prepareVisibleItemTransitions(); | ||
| 33 | |||
| 34 | - QRectF viewBounds(0, position(), q->width(), q->height()); | ||
| 35 | + QRectF viewBounds(q->contentX(), q->contentY(), q->width(), q->height()); | ||
| 36 | for (QList<FxViewItem*>::Iterator it = releasePendingTransition.begin(); | ||
| 37 | it != releasePendingTransition.end(); ) { | ||
| 38 | FxViewItem *item = *it; | ||
| 39 | -- | ||
| 40 | 1.8.3.2 | ||
| 41 | |||
