[SCM] qtdeclarative packaging branch, ubuntu+1, updated. debian/5.7.0-2-114-gd6d2f13

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=5935dbf

The following commit has been merged in the ubuntu+1 branch:
commit 5935dbf8bc4dbbb130aa4dc19b74b68522028a15
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Sep 7 13:13:10 2016 +0000

    New upstream release.
    
    * New upstream release.
    * Drop patches now in upstream.
---
 debian/changelog                                   |  8 ++-
 ...iew-forceLayout-Also-call-layout-when-d-f.patch | 76 ----------------------
 debian/patches/series                              | 16 ++---
 3 files changed, 10 insertions(+), 90 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f0d29ef..7f0803a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-qtdeclarative-opensource-src (5.7.0-3) UNRELEASED; urgency=medium
+qtdeclarative-opensource-src (5.7.0-2ubuntu1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Merge 5.6.1-7 from unstable.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 29 Aug 2016 21:49:25 +0300
+  [ Timo Jyrinki ]
+  * New upstream release.
+  * Drop patches now in upstream.
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Wed, 07 Sep 2016 13:12:08 +0000
 
 qtdeclarative-opensource-src (5.7.0-2) experimental; urgency=medium
 
diff --git a/debian/patches/QQuickItemView-forceLayout-Also-call-layout-when-d-f.patch b/debian/patches/QQuickItemView-forceLayout-Also-call-layout-when-d-f.patch
deleted file mode 100644
index 356dab0..0000000
--- a/debian/patches/QQuickItemView-forceLayout-Also-call-layout-when-d-f.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 201dec50b6f08b740aab9947725f8f5ec36349bb Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <albert.astals at canonical.com>
-Date: Mon, 7 Mar 2016 13:18:56 +0100
-Subject: [PATCH] QQuickItemView::forceLayout: Also call layout when
- d->forceLayout
-
-This way callers of forceLayout get a relayout if the dimension
-of a delegate that affects the itemview content size has just changed
-but the itemview content size has not been updated yet.
-
-This is useful because sometimes in the QML side you want to do things when the
-item view delegate size has changed but need the item view content size to be already updated.
-
-Change-Id: I846984a841e8e14c84d7a700a7ff736196b60afb
-Reviewed-by: Michael Brasser <michael.brasser at live.com>
-Reviewed-by: Shawn Rutledge <shawn.rutledge at theqtcompany.com>
----
- src/quick/items/qquickitemview.cpp           |  3 ++-
- tests/auto/qmltest/listview/tst_listview.qml | 21 +++++++++++++++++++++
- 2 files changed, 23 insertions(+), 1 deletion(-)
-
-diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
-index 188b347..aff03b7 100644
---- a/src/quick/items/qquickitemview.cpp
-+++ b/src/quick/items/qquickitemview.cpp
-@@ -1052,7 +1052,8 @@ QQuickItem *QQuickItemView::itemAt(qreal x, qreal y) const
- void QQuickItemView::forceLayout()
- {
-     Q_D(QQuickItemView);
--    d->applyPendingChanges();
-+    if (isComponentComplete() && (d->currentChanges.hasPendingChanges() || d->forceLayout))
-+        d->layout();
- }
- 
- void QQuickItemViewPrivate::applyPendingChanges()
-diff --git a/tests/auto/qmltest/listview/tst_listview.qml b/tests/auto/qmltest/listview/tst_listview.qml
-index 988d30f..75429c4 100644
---- a/tests/auto/qmltest/listview/tst_listview.qml
-+++ b/tests/auto/qmltest/listview/tst_listview.qml
-@@ -51,6 +51,22 @@ Item {
-     }
- 
-     ListView {
-+        id: singleElementList
-+        height: 20
-+        width: 50
-+        model: 1
-+        property real heightForDelegate: 100
-+        property real contentHeightOnDelegateResize
-+        delegate: Rectangle {
-+            height: singleElementList.heightForDelegate
-+            onHeightChanged: {
-+                singleElementList.forceLayout();
-+                singleElementList.contentHeightOnDelegateResize = singleElementList.contentHeight;
-+            }
-+        }
-+    }
-+
-+    ListView {
-         id: viewmanyitems
-         model: manyitems
-         delegate: Text { text: model.name }
-@@ -313,5 +329,10 @@ Item {
-             compare(listInteractiveCurrentIndexEnforce.currentIndex, 1);
-             tryCompare(listInteractiveCurrentIndexEnforce, "contentX", listInteractiveCurrentIndexEnforce.width);
-         }
-+
-+        function test_forceLayoutForContentHeight() {
-+            singleElementList.heightForDelegate = 200;
-+            compare(singleElementList.contentHeightOnDelegateResize, 200);
-+        }
-     }
- }
--- 
-2.7.0
-
diff --git a/debian/patches/series b/debian/patches/series
index c73d5a2..d2f5cb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,19 +1,11 @@
 # Backported patches
 fix_engine_64bits_big_endian.diff
 no_lifetime_dse.diff
-QQuickItemView-forceLayout-Also-call-layout-when-d-f.patch
-qml_only_release_types_if_they_arent_referenced_anymore.patch
-no_lifetime_dse.diff
-V4-Always-set-the-tag-when-boxing-a-pointer-in-QV4-V.patch
-Fix-QQmlEngine-crash-on-big-endian-64-bit-architectu.patch
-Flickable-fix-minXExtent-minYExtent-when-content-is-.patch
-QQuickWindow-Fill-out-timestamps-in-QHoverEvents-sen.patch
-Fix-visibility-of-properties-in-value-types.patch
+#Fix-visibility-of-properties-in-value-types.patch
 
 # Debian patches
-check_system_double-conversion.patch
 
 # Ubuntu patches
-fix_binary_location_for_tests.patch
-disable_failing_tests.patch
-QML-Compilation-unit-caching-and-JIT-changes.patch
+#fix_binary_location_for_tests.patch
+#disable_failing_tests.patch
+#QML-Compilation-unit-caching-and-JIT-changes.patch

-- 
qtdeclarative packaging