[SCM] qtdeclarative packaging branch, ubuntu-lts, updated. debian/5.6.1-11-121-gd2f0c1e

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu-lts branch:
commit b9cfebc2062c88d3b5435d22a4d30ae0ac446df6
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Mar 22 09:40:28 2017 +0000

    Add patches required for supporting Qt Quick Controls 2 (ver 5.7) on 5.6.
    
    * Add patches required for supporting Qt Quick Controls 2 (ver 5.7) on 5.6.
      - debian/patches/Private-export-QQuickStateAction-for-Qt-Quick-Contro.patch
      - debian/patches/QQuickItem-added-isAncestorOf.patch
---
 debian/changelog                                   |   8 ++
 ...ort-QQuickStateAction-for-Qt-Quick-Contro.patch |  30 ++++++
 debian/patches/QQuickItem-added-isAncestorOf.patch | 118 +++++++++++++++++++++
 debian/patches/series                              |   5 +-
 debian/rules                                       |   5 +-
 5 files changed, 162 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eba0200..2108bcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qtdeclarative-opensource-src (5.6.2-0ubuntu1~~xenialoverlay1~6) xenial; urgency=medium
+
+  * Add patches required for supporting Qt Quick Controls 2 (ver 5.7) on 5.6.
+    - debian/patches/Private-export-QQuickStateAction-for-Qt-Quick-Contro.patch
+    - debian/patches/QQuickItem-added-isAncestorOf.patch
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Wed, 08 Mar 2017 07:46:16 +0000
+
 qtdeclarative-opensource-src (5.6.2-0ubuntu1~~xenialoverlay1~4) xenial; urgency=medium
 
   * Update symbols.
diff --git a/debian/patches/Private-export-QQuickStateAction-for-Qt-Quick-Contro.patch b/debian/patches/Private-export-QQuickStateAction-for-Qt-Quick-Contro.patch
new file mode 100644
index 0000000..22f2479
--- /dev/null
+++ b/debian/patches/Private-export-QQuickStateAction-for-Qt-Quick-Contro.patch
@@ -0,0 +1,30 @@
+From ab2c5be35dd8f339ec39f52364625a53fa6d0ded Mon Sep 17 00:00:00 2001
+From: J-P Nurmi <jpnurmi at theqtcompany.com>
+Date: Fri, 26 Feb 2016 11:08:27 +0100
+Subject: [PATCH] Private export QQuickStateAction for Qt Quick Controls 2
+
+Popup and drawer transitions need to be able to setup a list of
+QQuickStateActions for QQuickTransitionManager::transition().
+
+Change-Id: I062948170ce38d15ecf6075b45e8ca393b607562
+Reviewed-by: Mitch Curtis <mitch.curtis at theqtcompany.com>
+---
+ src/quick/util/qquickstate_p.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/quick/util/qquickstate_p.h b/src/quick/util/qquickstate_p.h
+index 5c33d4b..7d22ca9 100644
+--- a/src/quick/util/qquickstate_p.h
++++ b/src/quick/util/qquickstate_p.h
+@@ -64,7 +64,7 @@ class QQuickStateActionEvent;
+ class QQmlBinding;
+ class QQmlExpression;
+ 
+-class QQuickStateAction
++class Q_QUICK_PRIVATE_EXPORT QQuickStateAction
+ {
+ public:
+     QQuickStateAction();
+-- 
+2.9.3
+
diff --git a/debian/patches/QQuickItem-added-isAncestorOf.patch b/debian/patches/QQuickItem-added-isAncestorOf.patch
new file mode 100644
index 0000000..ba7ce49
--- /dev/null
+++ b/debian/patches/QQuickItem-added-isAncestorOf.patch
@@ -0,0 +1,118 @@
+From a2d154022ddd585fd4ed4cd9e1d1a00ddee3bf5c Mon Sep 17 00:00:00 2001
+From: Liang Qi <liang.qi at theqtcompany.com>
+Date: Thu, 19 Nov 2015 07:46:01 +0100
+Subject: [PATCH] QQuickItem: added isAncestorOf()
+
+[ChangeLog][QtQuick][QQuickItem] added isAncestorOf()
+
+Change-Id: I9f6e0574db787c6c9d2311223c6a3ae7fd820bab
+Reviewed-by: J-P Nurmi <jpnurmi at theqtcompany.com>
+---
+ src/quick/items/qquickitem.cpp                  | 20 +++++++++++++
+ src/quick/items/qquickitem.h                    |  2 ++
+ tests/auto/quick/qquickitem2/tst_qquickitem.cpp | 38 +++++++++++++++++++++++++
+ 3 files changed, 60 insertions(+)
+
+diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
+index b89482f..ae7b197 100644
+--- a/src/quick/items/qquickitem.cpp
++++ b/src/quick/items/qquickitem.cpp
+@@ -6825,6 +6825,26 @@ QQuickItem *QQuickItem::scopedFocusItem() const
+ }
+ 
+ /*!
++    Returns 
-- 
qtdeclarative packaging