[SCM] qtdeclarative packaging branch, master, updated. debian/5.6.1-1-13-gf10c113

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit a6d0429c388e616899e97438bd5de3630eb86f68
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Jun 13 09:45:44 2016 -0300

    Revert "Add debian/patches/QQuickItem-fix-an-infinite-loop-nextItemInFocusChain.patch"
    
    This reverts commit 3934763a1ef15628ba0ecfac8b35f18a984cb4b1.
---
 debian/changelog                                   |  2 -
 ...fix-an-infinite-loop-nextItemInFocusChain.patch | 85 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 88 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1d5ef0c..cb5f126 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,6 @@ qtdeclarative-opensource-src (5.5.1-4) UNRELEASED; urgency=medium
     - Fix every key being pressed twice on desktop (LP: #1451554)
   * debian/patches/Add-isTabFence-private-flag.patch:
     - Tab should not leave dialog/popover/menu (LP: #1526208)
-  * debian/patches/QQuickItem-fix-an-infinite-loop-nextItemInFocusChain.patch:
-    - Refine the previous patch (LP: #1526208)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 17 Feb 2016 10:15:48 +0000
 
diff --git a/debian/patches/QQuickItem-fix-an-infinite-loop-nextItemInFocusChain.patch b/debian/patches/QQuickItem-fix-an-infinite-loop-nextItemInFocusChain.patch
deleted file mode 100644
index ee90778..0000000
--- a/debian/patches/QQuickItem-fix-an-infinite-loop-nextItemInFocusChain.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 0cc242c679b54d91d43b865414b250e644a1d879 Mon Sep 17 00:00:00 2001
-From: Liang Qi <liang.qi at theqtcompany.com>
-Date: Wed, 20 Jan 2016 12:21:21 +0100
-Subject: [PATCH] QQuickItem: fix an infinite loop nextItemInFocusChain()
-
-When isTabFence is set to true and no children.
-
-Task-number: QTBUG-50516
-Change-Id: I8430336fde7ab041797f8f9d9dfe5b9d56fecddd
----
- src/quick/items/qquickitem.cpp                    |  2 ++
- tests/auto/quick/qquickitem2/data/qtbug_50516.qml |  9 +++++++++
- tests/auto/quick/qquickitem2/tst_qquickitem.cpp   | 20 ++++++++++++++++++++
- 3 files changed, 31 insertions(+)
- create mode 100644 tests/auto/quick/qquickitem2/data/qtbug_50516.qml
-
-diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
-index 224dece..059bb4b 100644
---- a/src/quick/items/qquickitem.cpp
-+++ b/src/quick/items/qquickitem.cpp
-@@ -2508,6 +2508,8 @@ QQuickItem* QQuickItemPrivate::nextPrevItemInTabFocusChain(QQuickItem *item, boo
-                 lastChild = prevTabChildItem(current, -1);
-         }
-         bool isTabFence = current->d_func()->isTabFence;
-+        if (isTabFence && !hasChildren)
-+            return current;
- 
-         // coming from parent: check children
-         if (hasChildren && from == current->parentItem()) {
-diff --git a/tests/auto/quick/qquickitem2/data/qtbug_50516.qml b/tests/auto/quick/qquickitem2/data/qtbug_50516.qml
-new file mode 100644
-index 0000000..5e2a60b
---- /dev/null
-+++ b/tests/auto/quick/qquickitem2/data/qtbug_50516.qml
-@@ -0,0 +1,9 @@
-+import QtQuick 2.1
-+import Test 1.0
-+
-+TabFence {
-+    objectName: "root"
-+    focus: true
-+    width: 800
-+    height: 600
-+}
-diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
-index c7717b9..7225724 100644
---- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
-+++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
-@@ -74,6 +74,7 @@ private slots:
-     void nextItemInFocusChain3();
- 
-     void tabFence();
-+    void qtbug_50516();
- 
-     void keys();
-     void standardKeys_data();
-@@ -1194,6 +1195,25 @@ void tst_QQuickItem::tabFence()
-     verifyTabFocusChain(window, fence1BacktabFocusChain, false /* forward */);
- }
- 
-+void tst_QQuickItem::qtbug_50516()
-+{
-+    QQuickView *window = new QQuickView(0);
-+    window->setBaseSize(QSize(800,600));
-+
-+    window->setSource(testFileUrl("qtbug_50516.qml"));
-+    window->show();
-+    window->requestActivate();
-+    QVERIFY(QTest::qWaitForWindowActive(window));
-+    QVERIFY(QGuiApplication::focusWindow() == window);
-+    QVERIFY(window->rootObject()->hasActiveFocus());
-+
-+    QQuickItem *contentItem = window->rootObject();
-+    QQuickItem *next = contentItem->nextItemInFocusChain(true);
-+    QCOMPARE(next, contentItem);
-+    next = contentItem->nextItemInFocusChain(false);
-+    QCOMPARE(next, contentItem);
-+}
-+
- void tst_QQuickItem::keys()
- {
-     QQuickView *window = new QQuickView(0);
--- 
-2.7.0.rc3
-
diff --git a/debian/patches/series b/debian/patches/series
index 46e0fde..5ca5158 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@ qmlplugindump-Don-t-try-to-import-Qt.test.qtestroot.patch
 Flickable-avoid-perturbing-the-timeline-further-whil.patch
 MultiPointTouchArea-Fixed-released-duplication-on-mo.patch
 Add-isTabFence-private-flag.patch
-QQuickItem-fix-an-infinite-loop-nextItemInFocusChain.patch
 
 # Debian patches
 check_system_double-conversion.patch

-- 
qtdeclarative packaging