[SCM] qtdeclarative packaging branch, ubuntu+1, updated. debian/5.6.0-rc-1-55-gb4821b6

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu+1 branch:
commit b4821b6268a2a475c7d5989450f50d593514574b
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Fri Mar 11 12:24:50 2016 +0000

    Modify QML cache patch to Qt 5.6 changes.
---
 debian/changelog                                         |  1 +
 .../QML-Compilation-unit-caching-and-JIT-changes.patch   | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7959d1c..4160da3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ qtdeclarative-opensource-src (5.6.0~rc-1ubuntu1) 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.
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 26 Jan 2016 10:07:50 +0000
 
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 527c31c..9a773bb 100644
--- a/debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch
+++ b/debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch
@@ -802,7 +802,7 @@ Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/jit/qv4cachedlinkdata_p.h
 ===================================================================
 --- /dev/null
 +++ qtdeclarative-opensource-src-5.6.0-rc/src/qml/jit/qv4cachedlinkdata_p.h
-@@ -0,0 +1,188 @@
+@@ -0,0 +1,196 @@
 +/***************************************************************************
 +**
 +** Copyright (C) 2014 Nomovok Ltd. All rights reserved.
@@ -858,6 +858,8 @@ Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/jit/qv4cachedlinkdata_p.h
 +    // call
 +    CACHED_LINK_TABLE_ENTRY_RUNTIME(callGlobalLookup),
 +    CACHED_LINK_TABLE_ENTRY_RUNTIME(callActivationProperty),
++    CACHED_LINK_TABLE_ENTRY_RUNTIME(callQmlScopeObjectProperty),
++    CACHED_LINK_TABLE_ENTRY_RUNTIME(callQmlContextObjectProperty),
 +    CACHED_LINK_TABLE_ENTRY_RUNTIME(callProperty),
 +    CACHED_LINK_TABLE_ENTRY_RUNTIME(callPropertyLookup),
 +    CACHED_LINK_TABLE_ENTRY_RUNTIME(callElement),
@@ -881,12 +883,15 @@ Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/jit/qv4cachedlinkdata_p.h
 +    // typeof
 +    CACHED_LINK_TABLE_ENTRY_RUNTIME(typeofValue),
 +    CACHED_LINK_TABLE_ENTRY_RUNTIME(typeofName),
++    CACHED_LINK_TABLE_ENTRY_RUNTIME(typeofScopeObjectProperty),
++    CACHED_LINK_TABLE_ENTRY_RUNTIME(typeofContextObjectProperty),
 +    CACHED_LINK_TABLE_ENTRY_RUNTIME(typeofMember),
 +    CACHED_LINK_TABLE_ENTRY_RUNTIME(typeofElement),
 +
 +    // delete
 +    CACHED_LINK_TABLE_ENTRY_RUNTIME(deleteElement),
 +    CACHED_LINK_TABLE_ENTRY_RUNTIME(deleteMember),
++    CACHED_LINK_TABLE_ENTRY_RUNTIME(deleteMemberString),
 +    CACHED_LINK_TABLE_ENTRY_RUNTIME(deleteName),
 +
 +    // exceptions & scopes
@@ -978,13 +983,16 @@ Index: qtdeclarative-opensource-src-5.6.0-rc/src/qml/jit/qv4cachedlinkdata_p.h
 +    CACHED_LINK_TABLE_ENTRY_RUNTIME(doubleToUInt),
 +
 +    // qml
-+    CACHED_LINK_TABLE_ENTRY_RUNTIME(getQmlIdArray),
++    CACHED_LINK_TABLE_ENTRY_RUNTIME(getQmlIdObject),
++    CACHED_LINK_TABLE_ENTRY_RUNTIME(getQmlContext),
 +    CACHED_LINK_TABLE_ENTRY_RUNTIME(getQmlImportedScripts),
-+    CACHED_LINK_TABLE_ENTRY_RUNTIME(getQmlContextObject),
-+    CACHED_LINK_TABLE_ENTRY_RUNTIME(getQmlScopeObject),
 +    CACHED_LINK_TABLE_ENTRY_RUNTIME(getQmlSingleton),
++    CACHED_LINK_TABLE_ENTRY_RUNTIME(getQmlContextObjectProperty),
++    CACHED_LINK_TABLE_ENTRY_RUNTIME(getQmlScopeObjectProperty),
 +    CACHED_LINK_TABLE_ENTRY_RUNTIME(getQmlAttachedProperty),
 +    CACHED_LINK_TABLE_ENTRY_RUNTIME(getQmlQObjectProperty),
++    CACHED_LINK_TABLE_ENTRY_RUNTIME(setQmlScopeObjectProperty),
++    CACHED_LINK_TABLE_ENTRY_RUNTIME(setQmlContextObjectProperty),
 +    CACHED_LINK_TABLE_ENTRY_RUNTIME(setQmlQObjectProperty)
 +};
 +

-- 
qtdeclarative packaging