Merge lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative-for-u-series-multiple-fixes into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

[Timo Jyrinki]

* Depend conditionally on libgl1 (LP: #1278871)
* debian/patches/Fix-marking-of-prototype-objects-in-chain.patch
  - Fix a crasher with deleted QQmlCompiledData as suggested by upstream
    (LP: #1304248)
* debian/patches/QQuickItemView-QQuickPathView-Fix-creation-of-delega.patch:
  - Fix "Carousel doesn't re-render properly after scrolling"
    (LP: #1307578)
* debian/patches/Implement-proper-support-for-layoutChange-in-QQmlDel.patch:
  - Fix a performance hit when editing sorted lists (LP: #1303746)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:147
http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-ci/16/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-amd64-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-armhf-ci/16/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-ci/16/rebuild

review: Needs Fixing (continuous-integration)

[lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative-for-u-series-multiple-fixes]

148. By Timo Jyrinki on 2014-04-25

* debian/patches/V4-regalloc-fix-register-spill-choice-under-high-pre.patch:
  - Fix differing JS results on AMD64/i386 (LP: #1312571)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:148
http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-ci/17/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-amd64-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-armhf-ci/17/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-ci/17/rebuild

review: Needs Fixing (continuous-integration)

[lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative-for-u-series-multiple-fixes]

149. By Timo Jyrinki on 2014-04-25

Updated symbols

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:149
http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-armhf-ci/18

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-ci/18/rebuild

review: Approve (continuous-integration)

[lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative-for-u-series-multiple-fixes]

150. By Timo Jyrinki on 2014-04-28

* Resync with Debian including renamed QML packages
* Rename QML modules as such, creating the proper transitional packages and
  renaming the necessary files:
  - qtdeclarative5-dialogs-plugin → qml-module-qtquick-dialogs.
  - qtdeclarative5-folderlistmodel-plugin →
    qml-module-qt-labs-folderlistmodel.
  - qtdeclarative5-localstorage-plugin → qml-module-qtquick-localstorage.
  - qtdeclarative5-models-plugin → qml-model-qtqml-models2.
  - qtdeclarative5-particles-plugin → qml-module-qtquick-particles2.
  - qtdeclarative5-privatewidgets-plugin →
    qml-module-qtquick-privatewidgets.
  - qtdeclarative5-qtquick2-plugin → qml-module-qtquick2.
  - qtdeclarative5-settings-plugin → qml-module-qt-labs-settings.
  - qtdeclarative5-test-plugin → qml-module-qttest.
  - qtdeclarative5-window-plugin → qml-module-qtquick-window2.
  - qtdeclarative5-xmllistmodel-plugin → qml-module-qtquick-xmllistmodel.
* Override lintian for duplicated long description on transitional packages.
* Add qml-module-qtquick2 as qml-module-qttest dependency.
* Update symbols files with buildd's logs.
* Upload to unstable.
* Add license to mark_private_symbols.sh and corresponding entry in
  debian/copyright.
* Update symbols files with buildd's logs.

151. By Timo Jyrinki on 2014-04-28

Add bug number.

Resync with Debian including renamed QML packages (LP: #1313547)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:151
http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-armhf-ci/19

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-ci/19/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-10 06:00:35 +0000
+++ debian/changelog	2014-04-28 07:48:46 +0000
@@ -1,3 +1,53 @@
+qtdeclarative-opensource-src (5.2.1-5ubuntu1) UNRELEASED; urgency=medium
+
+  * Resync with Debian including renamed QML packages (LP: #1313547)
+  * Depend conditionally on libgl1 (LP: #1278871)
+  * debian/patches/Fix-marking-of-prototype-objects-in-chain.patch
+    - Fix a crasher with deleted QQmlCompiledData as suggested by upstream
+      (LP: #1304248)
+  * debian/patches/QQuickItemView-QQuickPathView-Fix-creation-of-delega.patch:
+    - Fix "Carousel doesn't re-render properly after scrolling"
+      (LP: #1307578)
+  * debian/patches/Implement-proper-support-for-layoutChange-in-QQmlDel.patch:
+    - Fix a performance hit when editing sorted lists (LP: #1303746)
+  * debian/patches/V4-regalloc-fix-register-spill-choice-under-high-pre.patch:
+    - Fix differing JS results on AMD64/i386 (LP: #1312571)
+  * Updated symbols
+
+ -- Timo Jyrinki <[e-mail]>  Mon, 28 Apr 2014 07:35:22 +0000
+
+qtdeclarative-opensource-src (5.2.1-5) unstable; urgency=medium
+
+  * Rename QML modules as such, creating the proper transitional packages and
+    renaming the necessary files:
+    - qtdeclarative5-dialogs-plugin → qml-module-qtquick-dialogs.
+    - qtdeclarative5-folderlistmodel-plugin →
+      qml-module-qt-labs-folderlistmodel.
+    - qtdeclarative5-localstorage-plugin → qml-module-qtquick-localstorage.
+    - qtdeclarative5-models-plugin → qml-model-qtqml-models2.
+    - qtdeclarative5-particles-plugin → qml-module-qtquick-particles2.
+    - qtdeclarative5-privatewidgets-plugin →
+      qml-module-qtquick-privatewidgets.
+    - qtdeclarative5-qtquick2-plugin → qml-module-qtquick2.
+    - qtdeclarative5-settings-plugin → qml-module-qt-labs-settings.
+    - qtdeclarative5-test-plugin → qml-module-qttest.
+    - qtdeclarative5-window-plugin → qml-module-qtquick-window2.
+    - qtdeclarative5-xmllistmodel-plugin → qml-module-qtquick-xmllistmodel.
+  * Override lintian for duplicated long description on transitional packages.
+  * Add qml-module-qtquick2 as qml-module-qttest dependency.
+  * Update symbols files with buildd's logs.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <[e-mail]>  Thu, 03 Apr 2014 10:04:59 -0300
+
+qtdeclarative-opensource-src (5.2.1-4) unstable; urgency=medium
+
+  * Upload to unstable.
+  * Add license to mark_private_symbols.sh and corresponding entry in
+    debian/copyright.
+  * Update symbols files with buildd's logs.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <[e-mail]>  Mon, 24 Mar 2014 21:45:21 -0300
+
 qtdeclarative-opensource-src (5.2.1-3ubuntu15) trusty; urgency=medium
 
   * Fix_QSmoothedAnimation_sometimes_getting_stuck.patch

=== modified file 'debian/control'
--- debian/control	2014-04-10 05:58:37 +0000
+++ debian/control	2014-04-28 07:48:46 +0000
@@ -74,112 +74,230 @@
  This package contains the Qt Quick Test library for QtDeclarative module.
 
 Package: qtdeclarative5-dialogs-plugin
+Architecture: all
+Section: oldlibs
+Depends: qml-module-qtquick-dialogs, ${misc:Depends}
+Description: transitional dummy package for Qt 5 Dialogs QML module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This is a transitional dummy package which can be safely removed.
+
+Package: qml-module-qtquick-dialogs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: qtdeclarative5-privatewidgets-plugin,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: Qt 5 Dialogs QML plugin
+Depends: qml-module-qtquick-privatewidgets, ${misc:Depends}, ${shlibs:Depends}
+Breaks: qtdeclarative5-dialogs-plugin (<< 5.2.1-5~)
+Replaces: qtdeclarative5-dialogs-plugin (<< 5.2.1-5~)
+Description: Qt 5 Dialogs QML module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
  The Dialogs module provides FileDialog and ColorDialog types.
 
 Package: qtdeclarative5-folderlistmodel-plugin
+Architecture: all
+Section: oldlibs
+Depends: qml-module-qt-labs-folderlistmodel, ${misc:Depends}
+Description: transitional dummy package for Qt 5 folderlistmodel QML module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This is a transitional dummy package which can be safely removed.
+
+Package: qml-module-qt-labs-folderlistmodel
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 5 folderlistmodel QML plugin
+Breaks: qtdeclarative5-folderlistmodel-plugin (<< 5.2.1-5~)
+Replaces: qtdeclarative5-folderlistmodel-plugin (<< 5.2.1-5~)
+Description: Qt 5 folderlistmodel QML module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
  The FolderListModel provides a model of the contents of a file system folder.
 
 Package: qtdeclarative5-localstorage-plugin
+Architecture: all
+Section: oldlibs
+Depends: qml-module-qtquick-localstorage, ${misc:Depends}
+Description: transitional dummy package for Qt 5 localstorage QML module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This is a transitional dummy package which can be safely removed.
+
+Package: qml-module-qtquick-localstorage
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libqt5sql5-sqlite, ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 5 localstorage QML plugin
+Breaks: qtdeclarative5-localstorage-plugin (<< 5.2.1-5~)
+Replaces: qtdeclarative5-localstorage-plugin (<< 5.2.1-5~)
+Description: Qt 5 localstorage QML module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
  This is a singleton type for reading and writing to SQLite databases.
 
 Package: qtdeclarative5-models-plugin
+Architecture: all
+Section: oldlibs
+Depends: qml-model-qtqml-models2, ${misc:Depends}
+Description: transitional dummy package for Qt 5 Models2 QML module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This is a transitional dummy package which can be safely removed.
+
+Package: qml-model-qtqml-models2
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 5 Models QML plugin
+Breaks: qtdeclarative5-models-plugin (<< 5.2.1-5~)
+Replaces: qtdeclarative5-models-plugin (<< 5.2.1-5~)
+Description: Qt 5 Models2 QML module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
  The Models provides types previously found in Qt Quick module.
 
 Package: qtdeclarative5-particles-plugin
+Architecture: all
+Section: oldlibs
+Depends: qml-module-qtquick-particles2, ${misc:Depends}
+Description: transitional dummy package for Qt 5 particles 2 QML module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This is a transitional dummy package which can be safely removed.
+
+Package: qml-module-qtquick-particles2
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 5 particles QML plugin
+Breaks: qtdeclarative5-particles-plugin (<< 5.2.1-5~)
+Replaces: qtdeclarative5-particles-plugin (<< 5.2.1-5~)
+Description: Qt 5 particles 2 QML module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
  This QML module contains a particle system for Qt Quick.
 
 Package: qtdeclarative5-privatewidgets-plugin
+Architecture: all
+Section: oldlibs
+Depends: qml-module-qtquick-privatewidgets, ${misc:Depends}
+Description: transitional dummy package for Qt 5 Private Widgets QML module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This is a transitional dummy package which can be safely removed.
+
+Package: qml-module-qtquick-privatewidgets
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 5 Private Widgets QML plugin
+Breaks: qtdeclarative5-privatewidgets-plugin (<< 5.2.1-5~)
+Replaces: qtdeclarative5-privatewidgets-plugin (<< 5.2.1-5~)
+Description: Qt 5 Private Widgets QML module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
- This package contains the Private Widgets plugin.
+ This package contains the Private Widgets module.
 
 Package: qtdeclarative5-qtquick2-plugin
+Architecture: all
+Section: oldlibs
+Depends: qml-module-qtquick2, ${misc:Depends}
+Description: transitional dummy package Qt 5 Qt Quick 2 QML module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This is a transitional dummy package which can be safely removed.
+
+Package: qml-module-qtquick2
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libgl1-mesa-dri, ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 5 Qt Quick 2 QML plugin
+Depends: libgl1-mesa-dri | libgl1, ${misc:Depends}, ${shlibs:Depends}
+Breaks: qtdeclarative5-qtquick2-plugin (<< 5.2.1-5~)
+Replaces: qtdeclarative5-qtquick2-plugin (<< 5.2.1-5~)
+Description: Qt 5 Qt Quick 2 QML module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
- This package contains the Qt Quick 2 QML plugin for Qt declarative.
+ This package contains the Qt Quick 2 QML module for Qt declarative.
 
 Package: qtdeclarative5-settings-plugin
+Architecture: all
+Section: oldlibs
+Depends: qml-module-qt-labs-settings, ${misc:Depends}
+Description: transitional dummy package for Qt 5 settings QML module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This is a transitional dummy package which can be safely removed.
+
+Package: qml-module-qt-labs-settings
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 5 settings QML plugin
+Breaks: qtdeclarative5-settings-plugin (<< 5.2.1-5~)
+Replaces: qtdeclarative5-settings-plugin (<< 5.2.1-5~)
+Description: Qt 5 settings QML module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
- This package contains the settings QML plugin for Qt declarative.
+ This package contains the settings QML module for Qt declarative.
 
 Package: qtdeclarative5-test-plugin
+Architecture: all
+Section: oldlibs
+Depends: qml-module-qttest, ${misc:Depends}
+Description: transitional dummy package for Qt 5 test QML module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This is a transitional dummy package which can be safely removed.
+
+Package: qml-module-qttest
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 5 test QML plugin
+Depends: qml-module-qtquick2, ${misc:Depends}, ${shlibs:Depends}
+Breaks: qtdeclarative5-test-plugin (<< 5.2.1-5~)
+Replaces: qtdeclarative5-test-plugin (<< 5.2.1-5~)
+Description: Qt 5 test QML module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
- This package contains the test QML plugin for Qt declarative.
+ This package contains the test QML module for Qt declarative.
 
 Package: qtdeclarative5-window-plugin
+Architecture: all
+Section: oldlibs
+Depends: qml-module-qtquick-window2, ${misc:Depends}
+Description: transitional dummy package for Qt 5 window 2 QML module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This is a transitional dummy package which can be safely removed.
+
+Package: qml-module-qtquick-window2
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 5 window QML plugin
+Breaks: qtdeclarative5-window-plugin (<< 5.2.1-5~)
+Replaces: qtdeclarative5-window-plugin (<< 5.2.1-5~)
+Description: Qt 5 window 2 QML module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
@@ -187,11 +305,23 @@
  accessing screen information.
 
 Package: qtdeclarative5-xmllistmodel-plugin
+Architecture: all
+Section: oldlibs
+Depends: qml-module-qtquick-xmllistmodel, ${misc:Depends}
+Description: transitional dummy package for Qt 5 xmllistmodel QML module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This is a transitional dummy package which can be safely removed.
+
+Package: qml-module-qtquick-xmllistmodel
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 5 xmllistmodel QML plugin
+Breaks: qtdeclarative5-xmllistmodel-plugin (<< 5.2.1-5~)
+Replaces: qtdeclarative5-xmllistmodel-plugin (<< 5.2.1-5~)
+Description: Qt 5 xmllistmodel QML module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
@@ -271,12 +401,12 @@
 Multi-Arch: same
 Section: x11
 Pre-Depends: ${misc:Pre-Depends}
-Depends: qtdeclarative5-dialogs-plugin,
-         qtdeclarative5-localstorage-plugin,
-         qtdeclarative5-models-plugin,
-         qtdeclarative5-particles-plugin,
-         qtdeclarative5-test-plugin,
-         qtdeclarative5-xmllistmodel-plugin,
+Depends: qml-model-qtqml-models2,
+         qml-module-qtquick-dialogs,
+         qml-module-qtquick-localstorage,
+         qml-module-qtquick-particles2,
+         qml-module-qtquick-xmllistmodel,
+         qml-module-qttest,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Qt 5 declarative examples

=== modified file 'debian/copyright'
--- debian/copyright	2013-12-17 09:01:49 +0000
+++ debian/copyright	2014-04-28 07:48:46 +0000
@@ -8,6 +8,10 @@
            1994-2008 Trolltech ASA.
 License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
 
+Files: debian/mark_private_symbols.sh
+Copyright: 2013 Sune Vuorela <[e-mail]>
+License: Expat
+
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <[e-mail]>
            2007-2012 Sune Vuorela <[e-mail]>
@@ -754,3 +758,19 @@
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

=== modified file 'debian/libqt5qml5.symbols'
--- debian/libqt5qml5.symbols	2014-03-10 16:35:49 +0000
+++ debian/libqt5qml5.symbols	2014-04-28 07:48:46 +0000
@@ -590,7 +590,7 @@
  _ZN17QQmlDelegateModel15_q_rowsInsertedERK11QModelIndexii@Base 5.1.0 1
  _ZN17QQmlDelegateModel15setWatchedRolesE5QListI10QByteArrayE@Base 5.1.0 1
  _ZN17QQmlDelegateModel16_q_itemsInsertedEii@Base 5.1.0 1
- _ZN17QQmlDelegateModel16_q_layoutChangedEv@Base 5.1.0 1
+ _ZN17QQmlDelegateModel16_q_layoutChangedERK5QListI21QPersistentModelIndexEN18QAbstractItemModel16LayoutChangeHintE@Base 5.2.1 1
  _ZN17QQmlDelegateModel16resetFilterGroupEv@Base 5.1.0 1
  _ZN17QQmlDelegateModel16rootIndexChangedEv@Base 5.1.0 1
  _ZN17QQmlDelegateModel16staticMetaObjectE@Base 5.1.0 1
@@ -599,6 +599,7 @@
  _ZN17QQmlDelegateModel20defaultGroupsChangedEv@Base 5.1.0 1
  _ZN17QQmlDelegateModel21qmlAttachedPropertiesEP7QObject@Base 5.1.0 1
  _ZN17QQmlDelegateModel23_q_rowsAboutToBeRemovedERK11QModelIndexii@Base 5.1.0 1
+ _ZN17QQmlDelegateModel25_q_layoutAboutToBeChangedERK5QListI21QPersistentModelIndexEN18QAbstractItemModel16LayoutChangeHintE@Base 5.2.1 1
  _ZN17QQmlDelegateModel5eventEP6QEvent@Base 5.1.0 1
  _ZN17QQmlDelegateModel5itemsEv@Base 5.1.0 1
  _ZN17QQmlDelegateModel5partsEv@Base 5.1.0 1

=== modified file 'debian/mark_private_symbols.sh'
--- debian/mark_private_symbols.sh	2013-08-30 11:58:43 +0000
+++ debian/mark_private_symbols.sh	2014-04-28 07:48:46 +0000
@@ -1,4 +1,24 @@
 #! /bin/sh
+# Copyright (c) 2013 Sune Vuorela <[e-mail]>
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 PRIVATE_HEADERS=qtdeclarative5-private-dev/usr/include
 

=== added file 'debian/patches/Fix-marking-of-prototype-objects-in-chain.patch'
--- debian/patches/Fix-marking-of-prototype-objects-in-chain.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/Fix-marking-of-prototype-objects-in-chain.patch	2014-04-28 07:48:46 +0000
@@ -0,0 +1,89 @@
+From 0d90b1d646d9f443f071f474911cd7a8495d523b Mon Sep 17 00:00:00 2001
+From: Simon Hausmann <[e-mail]>
+Date: Mon, 7 Apr 2014 11:20:03 +0200
+Subject: [PATCH] Fix marking of prototype objects in chain
+
+With a real prototype chain it can happen that an internal class' prototype's
+class itself has a prototype. Therefore the first transition on the empty class
+is a PrototypeChange one, but the class the transition leads to may have
+PrototypeChange transitions itself, which weren't marked.
+
+There are multiple solutions to this, but this patch is the minimal fix by
+recursing fully through the internal class tree. That way it's easier to
+back-port the fix also into 5.2.x based branches.
+
+Task-number: QTBUG-37834
+
+Change-Id: I901b13a2663fbad5844003ca5752f2f304de320c
+---
+ src/qml/jsruntime/qv4internalclass.cpp     | 15 ++++++---------
+ tests/auto/qml/qjsengine/tst_qjsengine.cpp | 18 ++++++++++++++++++
+ 2 files changed, 24 insertions(+), 9 deletions(-)
+
+diff --git a/src/qml/jsruntime/qv4internalclass.cpp b/src/qml/jsruntime/qv4internalclass.cpp
+index 4fe8f0b..dab137b 100644
+--- a/src/qml/jsruntime/qv4internalclass.cpp
++++ b/src/qml/jsruntime/qv4internalclass.cpp
+@@ -458,17 +458,14 @@ void InternalClass::destroy()
+ void InternalClass::markObjects()
+ {
+     // all prototype changes are done on the empty class
+-    Q_ASSERT(!prototype);
++    Q_ASSERT(!prototype || this != engine->emptyClass);
++
++    if (prototype)
++        prototype->mark(engine);
+ 
+     for (QHash<Transition, InternalClass *>::ConstIterator it = transitions.begin(), end = transitions.end();
+-         it != end; ++it) {
+-        if (it.key().flags == Transition::VTableChange) {
+-            it.value()->markObjects();
+-        } else if (it.key().flags == Transition::ProtoChange) {
+-            Q_ASSERT(it.value()->prototype);
+-            it.value()->prototype->mark(engine);
+-        }
+-    }
++         it != end; ++it)
++        it.value()->markObjects();
+ }
+ 
+ QT_END_NAMESPACE
+diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
+index 518d3e9..7ef6bd9 100644
+--- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp
++++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
+@@ -151,6 +151,8 @@ private slots:
+     void functionDeclarationsInConditionals();
+ 
+     void arrayPop_QTBUG_35979();
++    void prototypeChainGc();
++
+ };
+ 
+ tst_QJSEngine::tst_QJSEngine()
+@@ -2942,6 +2944,22 @@ void tst_QJSEngine::indexedAccesses()
+     QCOMPARE(result.toString(), QString("1,3"));
+ }
+
++void tst_QJSEngine::prototypeChainGc()
++{
++    QJSEngine engine;
++
++    QJSValue getProto = engine.evaluate("Object.getPrototypeOf");
++
++    QJSValue factory = engine.evaluate("function() { return Object.create(Object.create({})); }");
++    QVERIFY(factory.isCallable());
++    QJSValue obj = factory.call();
++    engine.collectGarbage();
++
++    QJSValue proto = getProto.call(QJSValueList() << obj);
++    proto = getProto.call(QJSValueList() << proto);
++    QVERIFY(proto.isObject());
++}
++
+ QTEST_MAIN(tst_QJSEngine)
+ 
+ #include "tst_qjsengine.moc"
+-- 
+1.9.1
+

=== added file 'debian/patches/Implement-proper-support-for-layoutChange-in-QQmlDel.patch'
--- debian/patches/Implement-proper-support-for-layoutChange-in-QQmlDel.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/Implement-proper-support-for-layoutChange-in-QQmlDel.patch	2014-04-28 07:48:46 +0000
@@ -0,0 +1,158 @@
+From 4d4bd2ac531f0456135a1077f5fceea3517cd3cd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <[e-mail]>
+Date: Wed, 16 Apr 2014 18:33:24 +0200
+Subject: [PATCH] Implement proper support for layoutChange in
+ QQmlDelegateModel
+
+Current implementation is treating model layoutChange the same way as modelReset,
+which causes problems when using ListView on top of a QSortFilterProxyModel. The
+model emits layoutChanged whenever a data within sorting column change. Treating
+it as modelReset leads to poor performance on large models and caused UI issues,
+because the scrolling position is reset every time.
+
+This patch implements proper handling for layoutChanged signals by first handling
+all items moves and then simulating dataChange for all items.
+
+This fixes regression from Qt 5.1 introduced by Change I16b859d9
+
+Task-number: QTBUG-37983
+Task-number: QTBUG-34391
+Change-Id: I6d3873b7b87e7f0e8fc0c1ed5dc80c6f8fdf6c22
+---
+ src/qml/types/qqmldelegatemodel.cpp   | 59 +++++++++++++++++++++++++++++++++--
+ src/qml/types/qqmldelegatemodel_p.h   |  3 +-
+ src/qml/types/qqmldelegatemodel_p_p.h |  2 ++
+ src/qml/util/qqmladaptormodel.cpp     | 12 ++++---
+ 4 files changed, 69 insertions(+), 7 deletions(-)
+
+diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp
+index be479ee..4591d42 100644
+--- a/src/qml/types/qqmldelegatemodel.cpp
++++ b/src/qml/types/qqmldelegatemodel.cpp
+@@ -1521,9 +1521,64 @@ void QQmlDelegateModel::_q_dataChanged(const QModelIndex &begin, const QModelInd
+         _q_itemsChanged(begin.row(), end.row() - begin.row() + 1, roles);
+ }
+ 
+-void QQmlDelegateModel::_q_layoutChanged()
++void QQmlDelegateModel::_q_layoutAboutToBeChanged(const QList<QPersistentModelIndex> &parents, QAbstractItemModel::LayoutChangeHint hint)
+ {
+-    _q_modelReset();
++    Q_D(QQmlDelegateModel);
++    if (!d->m_complete)
++        return;
++
++    if (hint == QAbstractItemModel::VerticalSortHint) {
++        d->m_storedPersistentIndexes.clear();
++        if (!parents.contains(d->m_adaptorModel.rootIndex))
++            return;
++
++        for (int i = 0; i < d->m_count; ++i) {
++            const QModelIndex index = d->m_adaptorModel.aim()->index(i, 0, d->m_adaptorModel.rootIndex);
++            d->m_storedPersistentIndexes.append(index);
++        }
++    } else if (hint == QAbstractItemModel::HorizontalSortHint) {
++        // Ignored
++    } else {
++        // Triggers model reset, no preparations for that are needed
++    }
++}
++
++void QQmlDelegateModel::_q_layoutChanged(const QList<QPersistentModelIndex> &parents, QAbstractItemModel::LayoutChangeHint hint)
++{
++    Q_D(QQmlDelegateModel);
++    if (!d->m_complete)
++        return;
++
++    if (hint == QAbstractItemModel::VerticalSortHint) {
++        if (!parents.contains(d->m_adaptorModel.rootIndex))
++            return;
++
++        for (int i = 0, c = d->m_storedPersistentIndexes.count(); i < c; ++i) {
++            const QPersistentModelIndex &index = d->m_storedPersistentIndexes.at(i);
++            if (i == index.row())
++                continue;
++
++            QVector<Compositor::Insert> inserts;
++            QVector<Compositor::Remove> removes;
++            d->m_compositor.listItemsMoved(&d->m_adaptorModel, i, index.row(), 1, &removes, &inserts);
++            if (!removes.isEmpty() || !inserts.isEmpty()) {
++                d->itemsMoved(removes, inserts);
++            }
++        }
++
++        d->m_storedPersistentIndexes.clear();
++
++        // layoutUpdate does not necessarily have any move changes, but it can
++        // also mean data changes. We can't detect what exactly has changed, so
++        // just emit it for all items
++        _q_itemsChanged(0, d->m_count, QVector<int>());
++
++    } else if (hint == QAbstractItemModel::HorizontalSortHint) {
++        // Ignored
++    } else {
++        // We don't know what's going on, so reset the model
++        _q_modelReset();
++    }
+ }
+ 
+ QQmlDelegateModelAttached *QQmlDelegateModel::qmlAttachedProperties(QObject *obj)
+diff --git a/src/qml/types/qqmldelegatemodel_p.h b/src/qml/types/qqmldelegatemodel_p.h
+index 51f846e..0b67179 100644
+--- a/src/qml/types/qqmldelegatemodel_p.h
++++ b/src/qml/types/qqmldelegatemodel_p.h
+@@ -139,7 +139,8 @@ private Q_SLOTS:
+     void _q_rowsRemoved(const QModelIndex &,int,int);
+     void _q_rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int);
+     void _q_dataChanged(const QModelIndex&,const QModelIndex&,const QVector<int> &);
+-    void _q_layoutChanged();
++    void _q_layoutAboutToBeChanged(const QList<QPersistentModelIndex>&, QAbstractItemModel::LayoutChangeHint);
++    void _q_layoutChanged(const QList<QPersistentModelIndex>&, QAbstractItemModel::LayoutChangeHint);
+ 
+ private:
+     Q_DISABLE_COPY(QQmlDelegateModel)
+diff --git a/src/qml/types/qqmldelegatemodel_p_p.h b/src/qml/types/qqmldelegatemodel_p_p.h
+index 32b1154..67deb4f 100644
+--- a/src/qml/types/qqmldelegatemodel_p_p.h
++++ b/src/qml/types/qqmldelegatemodel_p_p.h
+@@ -331,6 +331,8 @@ public:
+         };
+         QQmlDelegateModelGroup *m_groups[Compositor::MaximumGroupCount];
+     };
++
++    QList<QPersistentModelIndex> m_storedPersistentIndexes;
+ };
+ 
+ class QQmlPartsModel : public QQmlInstanceModel, public QQmlDelegateModelGroupEmitter
+diff --git a/src/qml/util/qqmladaptormodel.cpp b/src/qml/util/qqmladaptormodel.cpp
+index d38e5ac..c1c8bfa 100644
+--- a/src/qml/util/qqmladaptormodel.cpp
++++ b/src/qml/util/qqmladaptormodel.cpp
+@@ -467,8 +467,10 @@ public:
+                                 vdm, SLOT(_q_rowsMoved(QModelIndex,int,int,QModelIndex,int)));
+             QObject::disconnect(aim, SIGNAL(modelReset()),
+                                 vdm, SLOT(_q_modelReset()));
+-            QObject::disconnect(aim, SIGNAL(layoutChanged()),
+-                                vdm, SLOT(_q_layoutChanged()));
++            QObject::disconnect(aim, SIGNAL(layoutAboutToBeChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)),
++                                vdm, SLOT(_q_layoutAboutToBeChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)));
++            QObject::disconnect(aim, SIGNAL(layoutChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)),
++                                vdm, SLOT(_q_layoutChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)));
+         }
+ 
+         const_cast<VDMAbstractItemModelDataType *>(this)->release();
+@@ -920,8 +922,10 @@ void QQmlAdaptorModel::setModel(const QVariant &variant, QQmlDelegateModel *vdm,
+                               vdm, QQmlDelegateModel, SLOT(_q_rowsMoved(QModelIndex,int,int,QModelIndex,int)));
+             qmlobject_connect(model, QAbstractItemModel, SIGNAL(modelReset()),
+                               vdm, QQmlDelegateModel, SLOT(_q_modelReset()));
+-            qmlobject_connect(model, QAbstractItemModel, SIGNAL(layoutChanged()),
+-                              vdm, QQmlDelegateModel, SLOT(_q_layoutChanged()));
++            qmlobject_connect(model, QAbstractItemModel, SIGNAL(layoutAboutToBeChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)),
++                              vdm, QQmlDelegateModel, SLOT(_q_layoutAboutToBeChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)));
++            qmlobject_connect(model, QAbstractItemModel, SIGNAL(layoutChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)),
++                              vdm, QQmlDelegateModel, SLOT(_q_layoutChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)));
+         } else {
+             accessors = new VDMObjectDelegateDataType;
+         }
+-- 
+1.9.1
+

=== added file 'debian/patches/QQuickItemView-QQuickPathView-Fix-creation-of-delega.patch'
--- debian/patches/QQuickItemView-QQuickPathView-Fix-creation-of-delega.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/QQuickItemView-QQuickPathView-Fix-creation-of-delega.patch	2014-04-28 07:48:46 +0000
@@ -0,0 +1,128 @@
+From 712d89c638b6294a63fa735c5203983437a4345a Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <[e-mail]>
+Date: Tue, 15 Apr 2014 15:27:29 +0200
+Subject: [PATCH] QQuickItemView/QQuickPathView: Fix creation of delegates
+
+When the delegate is set before the model and
+after the ItemView/PathView has been created
+
+Task-number: QTBUG-38368
+Change-Id: I6963abe28087699cf4e8921153dc7641bae3b220
+---
+ src/quick/items/qquickitemview.cpp           |  2 ++
+ src/quick/items/qquickpathview.cpp           |  2 ++
+ tests/auto/qmltest/listview/tst_listview.qml | 23 ++++++++++++++++++
+ tests/auto/qmltest/pathview/tst_pathview.qml | 35 ++++++++++++++++++++++++++++
+ 4 files changed, 62 insertions(+)
+ create mode 100644 tests/auto/qmltest/pathview/tst_pathview.qml
+
+diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
+index 46eec64..b4f6c34 100644
+--- a/src/quick/items/qquickitemview.cpp
++++ b/src/quick/items/qquickitemview.cpp
+@@ -364,6 +364,8 @@ void QQuickItemView::setDelegate(QQmlComponent *delegate)
+     if (!d->ownModel) {
+         d->model = new QQmlDelegateModel(qmlContext(this));
+         d->ownModel = true;
++        if (isComponentComplete())
++            static_cast<QQmlDelegateModel *>(d->model.data())->componentComplete();
+     }
+     if (QQmlDelegateModel *dataModel = qobject_cast<QQmlDelegateModel*>(d->model)) {
+         int oldCount = dataModel->count();
+diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp
+index ec78967..45cd8e1 100644
+--- a/src/quick/items/qquickpathview.cpp
++++ b/src/quick/items/qquickpathview.cpp
+@@ -1242,6 +1242,8 @@ void QQuickPathView::setDelegate(QQmlComponent *delegate)
+     if (!d->ownModel) {
+         d->model = new QQmlDelegateModel(qmlContext(this));
+         d->ownModel = true;
++        if (isComponentComplete())
++            static_cast<QQmlDelegateModel *>(d->model.data())->componentComplete();
+     }
+     if (QQmlDelegateModel *dataModel = qobject_cast<QQmlDelegateModel*>(d->model)) {
+         int oldCount = dataModel->count();
+diff --git a/tests/auto/qmltest/listview/tst_listview.qml b/tests/auto/qmltest/listview/tst_listview.qml
+index 0589e7c..03be579 100644
+--- a/tests/auto/qmltest/listview/tst_listview.qml
++++ b/tests/auto/qmltest/listview/tst_listview.qml
+@@ -102,6 +102,23 @@ Item {
+         }
+     }
+ 
++    ListView {
++        id: listViewDelegateModelAfterCreate
++        anchors.fill: parent
++        property int createdDelegates: 0
++    }
++
++    Component {
++        id: delegateModelAfterCreateComponent
++        Rectangle {
++            width: 140
++            height: 140
++            border.color: "black"
++            color: "red"
++            Component.onCompleted: listViewDelegateModelAfterCreate.createdDelegates++;
++        }
++    }
++
+     ListModel { id: emptymodel }
+     ListModel { id: manyitems }
+     ListModel { id: firstmodel; ListElement { name: "FirstModelElement0" } }
+@@ -249,5 +266,11 @@ Item {
+                 asyncListViewLoaderView.currentIndex = 4;
+             }
+         }
++
++        function test_set_delegate_model_after_list_creation() {
++            listViewDelegateModelAfterCreate.delegate = delegateModelAfterCreateComponent;
++            listViewDelegateModelAfterCreate.model = 40;
++            verify(listViewDelegateModelAfterCreate.createdDelegates > 0);
++        }
+     }
+ }
+diff --git a/tests/auto/qmltest/pathview/tst_pathview.qml b/tests/auto/qmltest/pathview/tst_pathview.qml
+new file mode 100644
+index 0000000..820034c
+--- /dev/null
++++ b/tests/auto/qmltest/pathview/tst_pathview.qml
+@@ -0,0 +1,35 @@
++import QtQuick 2.1
++import QtTest 1.0
++
++Item {
++    id: top
++
++    PathView {
++        id: pathViewDelegateModelAfterCreate
++        anchors.fill: parent
++        property int createdDelegates: 0
++        path: Path { startX: 120; startY: 100 }
++    }
++
++    Component {
++        id: delegateModelAfterCreateComponent
++        Rectangle {
++            width: 140
++            height: 140
++            border.color: "black"
++            color: "red"
++            Component.onCompleted: pathViewDelegateModelAfterCreate.createdDelegates++;
++        }
++    }
++
++    TestCase {
++        name: "PathView"
++        when: windowShown
++
++        function test_set_delegate_model_after_path_creation() {
++            pathViewDelegateModelAfterCreate.delegate = delegateModelAfterCreateComponent;
++            pathViewDelegateModelAfterCreate.model = 40;
++            verify(pathViewDelegateModelAfterCreate.createdDelegates > 0);
++        }
++    }
++}
+-- 
+1.9.1
+

=== added file 'debian/patches/V4-regalloc-fix-register-spill-choice-under-high-pre.patch'
--- debian/patches/V4-regalloc-fix-register-spill-choice-under-high-pre.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/V4-regalloc-fix-register-spill-choice-under-high-pre.patch	2014-04-28 07:48:46 +0000
@@ -0,0 +1,50 @@
+From 093ca2f431bdd65e8f7eea1ec1cbb59f45061cd2 Mon Sep 17 00:00:00 2001
+From: Erik Verbruggen <[e-mail]>
+Date: Wed, 23 Apr 2014 15:13:56 +0200
+Subject: [PATCH] V4 regalloc: fix register spill choice under high pressure.
+
+When a register is needed for an input parameter of an operation, and
+all registers are already in use, do not select a register for spilling
+when it is also used in the current operation.
+
+Task-number: QTBUG-38451
+Change-Id: I4a8f28cbaadce2dbb9d0c450ccac0ed572936c24
+---
+ src/qml/jit/qv4regalloc.cpp | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/qml/jit/qv4regalloc.cpp b/src/qml/jit/qv4regalloc.cpp
+index 506fd8d..ba128c1 100644
+--- a/src/qml/compiler/qv4regalloc.cpp
++++ b/src/qml/compiler/qv4regalloc.cpp
+@@ -1222,6 +1222,10 @@ void RegisterAllocator::linearScan()
+ 
+         Q_ASSERT(!current.isFixedInterval());
+ 
++#ifdef DEBUG_REGALLOC
++        qDebug() << "** Position" << position;
++#endif // DEBUG_REGALLOC
++
+         if (_info->canHaveRegister(current.temp())) {
+             tryAllocateFreeReg(current, position);
+             if (current.reg() == LifeTimeInterval::Invalid)
+@@ -1374,11 +1378,15 @@ void RegisterAllocator::allocateBlockedReg(LifeTimeInterval &current, const int
+     QVector<LifeTimeInterval *> nextUseRangeForReg(nextUsePos.size(), 0);
+     Q_ASSERT(nextUsePos.size() > 0);
+ 
++    const bool definedAtCurrentPosition = !current.isSplitFromInterval() && current.start() == position;
++
+     for (int i = 0, ei = _active.size(); i != ei; ++i) {
+         LifeTimeInterval &it = _active[i];
+         if (it.isFP() == needsFPReg) {
+             int nu = it.isFixedInterval() ? 0 : nextUse(it.temp(), current.firstPossibleUsePosition(isPhiTarget));
+-            if (nu != -1 && nu < nextUsePos[it.reg()]) {
++            if (nu == position && !definedAtCurrentPosition) {
++                nextUsePos[it.reg()] = 0;
++            } else if (nu != -1 && nu < nextUsePos[it.reg()]) {
+                 nextUsePos[it.reg()] = nu;
+                 nextUseRangeForReg[it.reg()] = &it;
+             } else if (nu == -1 && nextUsePos[it.reg()] == INT_MAX) {
+-- 
+1.9.1
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-04-10 06:00:35 +0000
+++ debian/patches/series	2014-04-28 07:48:46 +0000
@@ -20,3 +20,7 @@
 0001-Call-tzset-from-getLocalTZA-so-we-learn-about-tz-cha.patch
 Support-RFC2822Date-date-format-similar-to-V8.patch
 Fix_QSmoothedAnimation_sometimes_getting_stuck.patch
+Fix-marking-of-prototype-objects-in-chain.patch
+QQuickItemView-QQuickPathView-Fix-creation-of-delega.patch
+Implement-proper-support-for-layoutChange-in-QQmlDel.patch
+V4-regalloc-fix-register-spill-choice-under-high-pre.patch

=== renamed file 'debian/qtdeclarative5-models-plugin.install' => 'debian/qml-model-qtqml-models2.install'
=== renamed file 'debian/qtdeclarative5-folderlistmodel-plugin.install' => 'debian/qml-module-qt-labs-folderlistmodel.install'
=== renamed file 'debian/qtdeclarative5-settings-plugin.install' => 'debian/qml-module-qt-labs-settings.install'
=== renamed file 'debian/qtdeclarative5-dialogs-plugin.install' => 'debian/qml-module-qtquick-dialogs.install'
--- debian/qtdeclarative5-dialogs-plugin.install	2014-02-10 15:33:35 +0000
+++ debian/qml-module-qtquick-dialogs.install	2014-04-28 07:48:46 +0000
@@ -1,1 +1,5 @@
-usr/lib/*/qt5/qml/QtQuick/Dialogs/
+usr/lib/*/qt5/qml/QtQuick/Dialogs/Private/libdialogsprivateplugin.so
+usr/lib/*/qt5/qml/QtQuick/Dialogs/Private/qmldir
+usr/lib/*/qt5/qml/QtQuick/Dialogs/libdialogplugin.so
+usr/lib/*/qt5/qml/QtQuick/Dialogs/plugins.qmltypes
+usr/lib/*/qt5/qml/QtQuick/Dialogs/qmldir

=== renamed file 'debian/qtdeclarative5-dialogs-plugin.lintian-overrides' => 'debian/qml-module-qtquick-dialogs.lintian-overrides'
--- debian/qtdeclarative5-dialogs-plugin.lintian-overrides	2013-08-30 11:58:43 +0000
+++ debian/qml-module-qtquick-dialogs.lintian-overrides	2014-04-28 07:48:46 +0000
@@ -1,1 +1,1 @@
-qtdeclarative5-dialogs-plugin: image-file-in-usr-lib
+qml-module-qtquick-dialogs: image-file-in-usr-lib

=== renamed file 'debian/qtdeclarative5-localstorage-plugin.install' => 'debian/qml-module-qtquick-localstorage.install'
=== renamed file 'debian/qtdeclarative5-particles-plugin.install' => 'debian/qml-module-qtquick-particles2.install'
=== renamed file 'debian/qtdeclarative5-privatewidgets-plugin.install' => 'debian/qml-module-qtquick-privatewidgets.install'
=== renamed file 'debian/qtdeclarative5-window-plugin.install' => 'debian/qml-module-qtquick-window2.install'
=== renamed file 'debian/qtdeclarative5-xmllistmodel-plugin.install' => 'debian/qml-module-qtquick-xmllistmodel.install'
=== renamed file 'debian/qtdeclarative5-qtquick2-plugin.install' => 'debian/qml-module-qtquick2.install'
=== renamed file 'debian/qtdeclarative5-test-plugin.install' => 'debian/qml-module-qttest.install'
=== added file 'debian/source/lintian-overrides'
--- debian/source/lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/source/lintian-overrides	2014-04-28 07:48:46 +0000
@@ -0,0 +1,1 @@
+qtdeclarative-opensource-src source: duplicate-long-description qtdeclarative5-dialogs-plugin qtdeclarative5-folderlistmodel-plugin qtdeclarative5-localstorage-plugin qtdeclarative5-models-plugin qtdeclarative5-particles-plugin qtdeclarative5-privatewidgets-plugin qtdeclarative5-qtquick2-plugin qtdeclarative5-settings-plugin qtdeclarative5-test-plugin qtdeclarative5-window-plugin qtdeclarative5-xmllistmodel-plugin