[SCM] qtdeclarative packaging branch, ubuntu+1, updated. debian/5.6.1-4-85-ga9edb26

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu+1 branch:
commit a9edb26a1115392537d76bec3097d4816a8ad22c
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Jul 19 06:05:14 2016 +0000

    Modify QML cache patch to Qt 5.6 and 5.6.1 changes. (LP: #1556824)
---
 debian/changelog                                                  | 2 +-
 debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2c18137..877cc7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,7 @@ qtdeclarative-opensource-src (5.6.1-4ubuntu1) UNRELEASED; urgency=medium
     - WIP-QQuickItem-fix-another-infinite-loop-in-nextItem.patch
     - qmlplugindump-Don-t-try-to-import-Qt.test.qtestroot.patch
   * Refresh QML cache and test binary location patches to apply.
-  * Modify QML cache patch to Qt 5.6 changes. (LP: #1556824)
+  * Modify QML cache patch to Qt 5.6 and 5.6.1 changes. (LP: #1556824)
   * Mark private symbols.
   * Update for Qt 5.6.1:
     - Drop debian/patches/Fix-crash-in-hasAtlasTexture.patch now in upstream.
diff --git a/debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch b/debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch
index 9776e38..94239fd 100644
--- a/debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch
+++ b/debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch
@@ -1137,9 +1137,9 @@ Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/qml/qqmlengine.cpp
 @@ -599,7 +599,8 @@ QQmlEnginePrivate::QQmlEnginePrivate(QQm
    activeObjectCreator(0),
    networkAccessManager(0), networkAccessManagerFactory(0), urlInterceptor(0),
-   scarceResourcesRefCount(0), typeLoader(e), importDatabase(e), uniqueId(1),
--  incubatorCount(0), incubationController(0)
-+  incubatorCount(0), incubationController(0),
+   scarceResourcesRefCount(0), importDatabase(e), typeLoader(e),
+-  uniqueId(1), incubatorCount(0), incubationController(0)
++  uniqueId(1), incubatorCount(0), incubationController(0),
 +  qmlCacheValid(0)
  {
  }

-- 
qtdeclarative packaging