From b0a6dfba690b3b20d1675748980a041f541baafd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Mon, 7 Oct 2013 22:57:17 +0200 Subject: qtdeclarative: update to 5.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard Signed-off-by: Martin Jansa --- .../0001-qmltestexample-fix-link.patch | 46 ---------------------- ...g-calculation-of-viewPort-for-transitions.patch | 41 ------------------- .../0001-qmltestexample-fix-link.patch | 46 ++++++++++++++++++++++ ...g-calculation-of-viewPort-for-transitions.patch | 41 +++++++++++++++++++ recipes-qt/qt5/qtdeclarative_5.1.0.bb | 15 ------- recipes-qt/qt5/qtdeclarative_5.1.1.bb | 15 +++++++ 6 files changed, 102 insertions(+), 102 deletions(-) delete mode 100644 recipes-qt/qt5/qtdeclarative-5.1.0/0001-qmltestexample-fix-link.patch delete mode 100644 recipes-qt/qt5/qtdeclarative-5.1.0/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch create mode 100644 recipes-qt/qt5/qtdeclarative-5.1.1/0001-qmltestexample-fix-link.patch create mode 100644 recipes-qt/qt5/qtdeclarative-5.1.1/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch delete mode 100644 recipes-qt/qt5/qtdeclarative_5.1.0.bb create mode 100644 recipes-qt/qt5/qtdeclarative_5.1.1.bb diff --git a/recipes-qt/qt5/qtdeclarative-5.1.0/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative-5.1.0/0001-qmltestexample-fix-link.patch deleted file mode 100644 index 7a68dd53..00000000 --- a/recipes-qt/qt5/qtdeclarative-5.1.0/0001-qmltestexample-fix-link.patch +++ /dev/null @@ -1,46 +0,0 @@ -From ea698b0a2588585356d1ea5139ca6feb7110611a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Eric=20B=C3=A9nard?= -Date: Sun, 26 May 2013 14:26:19 +0200 -Subject: [PATCH 1/3] qmltestexample: fix link -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -else we get : -ld: warning: libQt5Quick.so.5, needed by libQt5QuickTest.so, not found - -Upstream-Status: Inappropriate - -Signed-off-by: Eric Bénard ---- - examples/qmltest/qmltest/qmltest.pro | 2 +- - tools/qmltestrunner/qmltestrunner.pro | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro -index b5893c5..1b00e6c 100644 ---- a/examples/qmltest/qmltest/qmltest.pro -+++ b/examples/qmltest/qmltest/qmltest.pro -@@ -14,7 +14,7 @@ TESTDATA += tst_basic.qml tst_item.qml - # This code exists solely for the purpose of building this example - # inside the examples/ hierarchy. - --QT += qml qmltest -+QT += qml qmltest quick - - macx: CONFIG -= app_bundle - -diff --git a/tools/qmltestrunner/qmltestrunner.pro b/tools/qmltestrunner/qmltestrunner.pro -index 5184c1f..668cf17 100644 ---- a/tools/qmltestrunner/qmltestrunner.pro -+++ b/tools/qmltestrunner/qmltestrunner.pro -@@ -1,5 +1,5 @@ - SOURCES += main.cpp - --QT += qml qmltest -+QT += qml qmltest quick - - load(qt_tool) --- -1.8.3.2 - diff --git a/recipes-qt/qt5/qtdeclarative-5.1.0/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative-5.1.0/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch deleted file mode 100644 index d355e488..00000000 --- a/recipes-qt/qt5/qtdeclarative-5.1.0/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6d28b0ec1bc93fea7502fadfbc12f8198ccf9d14 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 3/3] 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 - diff --git a/recipes-qt/qt5/qtdeclarative-5.1.1/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative-5.1.1/0001-qmltestexample-fix-link.patch new file mode 100644 index 00000000..7a68dd53 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative-5.1.1/0001-qmltestexample-fix-link.patch @@ -0,0 +1,46 @@ +From ea698b0a2588585356d1ea5139ca6feb7110611a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Eric=20B=C3=A9nard?= +Date: Sun, 26 May 2013 14:26:19 +0200 +Subject: [PATCH 1/3] qmltestexample: fix link +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +else we get : +ld: warning: libQt5Quick.so.5, needed by libQt5QuickTest.so, not found + +Upstream-Status: Inappropriate + +Signed-off-by: Eric Bénard +--- + examples/qmltest/qmltest/qmltest.pro | 2 +- + tools/qmltestrunner/qmltestrunner.pro | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro +index b5893c5..1b00e6c 100644 +--- a/examples/qmltest/qmltest/qmltest.pro ++++ b/examples/qmltest/qmltest/qmltest.pro +@@ -14,7 +14,7 @@ TESTDATA += tst_basic.qml tst_item.qml + # This code exists solely for the purpose of building this example + # inside the examples/ hierarchy. + +-QT += qml qmltest ++QT += qml qmltest quick + + macx: CONFIG -= app_bundle + +diff --git a/tools/qmltestrunner/qmltestrunner.pro b/tools/qmltestrunner/qmltestrunner.pro +index 5184c1f..668cf17 100644 +--- a/tools/qmltestrunner/qmltestrunner.pro ++++ b/tools/qmltestrunner/qmltestrunner.pro +@@ -1,5 +1,5 @@ + SOURCES += main.cpp + +-QT += qml qmltest ++QT += qml qmltest quick + + load(qt_tool) +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtdeclarative-5.1.1/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative-5.1.1/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch new file mode 100644 index 00000000..d355e488 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative-5.1.1/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch @@ -0,0 +1,41 @@ +From 6d28b0ec1bc93fea7502fadfbc12f8198ccf9d14 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 3/3] 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 + diff --git a/recipes-qt/qt5/qtdeclarative_5.1.0.bb b/recipes-qt/qt5/qtdeclarative_5.1.0.bb deleted file mode 100644 index 2421bdbf..00000000 --- a/recipes-qt/qt5/qtdeclarative_5.1.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -require qt5-${PV}.inc -require ${PN}.inc - -SRC_URI += " \ - file://0001-qmltestexample-fix-link.patch \ - file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \ -" - -SRC_URI[md5sum] = "604a6e3ae051a21aac0024694d55cb3b" -SRC_URI[sha256sum] = "d8849755c17fca9bb44c09c442001bc5593c24986ea616c536719414e85d90cc" - -# /usr/lib/qt5/qml/QtQuick/Dialogs/images/*.png -FILES_${PN}-qmlplugins += " \ - ${OE_QMAKE_PATH_QML}/*/*/*/*.png \ -" diff --git a/recipes-qt/qt5/qtdeclarative_5.1.1.bb b/recipes-qt/qt5/qtdeclarative_5.1.1.bb new file mode 100644 index 00000000..be724691 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative_5.1.1.bb @@ -0,0 +1,15 @@ +require qt5-${PV}.inc +require ${PN}.inc + +SRC_URI += " \ + file://0001-qmltestexample-fix-link.patch \ + file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \ +" + +SRC_URI[md5sum] = "486fc16ad7b7d0c1488ba5482536d66c" +SRC_URI[sha256sum] = "0ee989a5d45a94e927609b22e2413c7f2788a7b4a23af66ecfa15c31db2a9b31" + +# /usr/lib/qt5/qml/QtQuick/Dialogs/images/*.png +FILES_${PN}-qmlplugins += " \ + ${OE_QMAKE_PATH_QML}/*/*/*/*.png \ +" -- cgit v1.2.3