Merge lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_clean_chain_of_incubated_objects into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

[Timo Jyrinki]

* debian/patches/clean_chain_of_incubated_objects.patch:
  - Backport from upstream https://codereview.qt-project.org/#change,80893

[Timo Jyrinki (timo-jyrinki)]

No CI here either it seems. Built fine.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-10 16:36:07 +0000
+++ debian/changelog	2014-03-14 08:04:38 +0000
@@ -1,3 +1,10 @@
+qtdeclarative-opensource-src (5.2.1-3ubuntu9) trusty; urgency=medium
+
+  * debian/patches/clean_chain_of_incubated_objects.patch:
+    - Backport from upstream https://codereview.qt-project.org/#change,80893
+
+ -- Timo Jyrinki <[e-mail]>  Fri, 14 Mar 2014 07:56:15 +0000
+
 qtdeclarative-opensource-src (5.2.1-3ubuntu8) trusty; urgency=medium
 
   * debian/libqt5qml5.symbols:

=== added file 'debian/patches/clean_chain_of_incubated_objects.patch'
--- debian/patches/clean_chain_of_incubated_objects.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/clean_chain_of_incubated_objects.patch	2014-03-14 08:04:38 +0000
@@ -0,0 +1,36 @@
+--- qtdeclarative-opensource-src-5.2.1.orig/src/qml/qml/qqmlincubator.cpp
++++ qtdeclarative-opensource-src-5.2.1/src/qml/qml/qqmlincubator.cpp
+@@ -168,6 +168,16 @@ void QQmlIncubatorPrivate::clear()
+         nextWaitingFor.remove();
+         waitingOnMe = 0;
+     }
++
++    // if we're waiting on any incubators then they should be cleared too.
++    while (waitingFor.first()) {
++        QQmlIncubator * i = static_cast<QQmlIncubatorPrivate*>(waitingFor.first())->q;
++        if (i)
++            i->clear();
++    }
++
++    vme.reset();
++    vmeGuard.clear();
+ }
+
+ /*!
+@@ -557,16 +567,6 @@ void QQmlIncubator::clear()
+
+     d->clear();
+
+-    // if we're waiting on any incubators then they should be cleared too.
+-    while (d->waitingFor.first()) {
+-        QQmlIncubator * i = static_cast<QQmlIncubatorPrivate*>(d->waitingFor.first())->q;
+-        if (i)
+-            i->clear();
+-    }
+-
+-    d->vme.reset();
+-    d->vmeGuard.clear();
+-
+     Q_ASSERT(d->compiledData == 0);
+     Q_ASSERT(d->waitingOnMe.data() == 0);
+     Q_ASSERT(d->waitingFor.isEmpty());

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-07 18:06:52 +0000
+++ debian/patches/series	2014-03-14 08:04:38 +0000
@@ -11,3 +11,4 @@
 Fix-crash-when-accessing-var-properties-in-objects-w.patch
 aarch64.patch
 ppc64el.patch
+clean_chain_of_incubated_objects.patch