Merge lp:~aacid/ubuntu-ui-toolkit/fix-borderimage-regression into lp:ubuntu-ui-toolkit/staging

[Albert Astals Cid]

Fix regression that broke BorderImage

Sorry :/

[Zsombor Egri (zsombi)]

Oh, what a weirdo :) Thanks for getting back to it.

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2185
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1479/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7808/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1479/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2185
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1694/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7809/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1694/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2185
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/917/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1694
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1479
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7810/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7809
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7808

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/917/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2185
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1695/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7811/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1695/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2185
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1480/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7812/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1480/rebuild

review: Approve (continuous-integration)

=== modified file 'src/UbuntuToolkit/ucqquickimageextension.cpp'
--- src/UbuntuToolkit/ucqquickimageextension.cpp	2017-02-06 13:20:30 +0000
+++ src/UbuntuToolkit/ucqquickimageextension.cpp	2017-03-10 12:04:49 +0000
@@ -86,19 +86,23 @@
             // This way if the Image {} has a sourceSize set the lambda gets called because of it
             // and if there's no sourceSize set the lambda gets called because we registered the finalize callback
 
-            connect(m_image, &QQuickImageBase::sourceSizeChanged,
-                             this,
-                             [&] {
-                                 QObject::disconnect(m_image, &QQuickImageBase::sourceSizeChanged, this, nullptr);
-                                 reloadSource();
-                            });
-
+            // WARNING do not convert this to a "modern-style" connect, i.e. &QQuickImageBase::sourceSizeChanged,
+            // it will break if m_image is a QQuickBorderImage since it redeclares the sourceSizeChanged
+            // See https://codereview.qt-project.org/#/c/187967/
+            connect(m_image, SIGNAL(sourceSizeChanged()), this, SLOT(onSourceSizeChanged()));
             QQmlEnginePrivate *engPriv = QQmlEnginePrivate::get(qmlEngine(m_image));
             engPriv->registerFinalizeCallback(m_image, m_image->metaObject()->indexOfSignal("sourceSizeChanged()"));
         }
     }
 }
 
+void UCQQuickImageExtension::onSourceSizeChanged()
+{
+    // See WARNING above
+    QObject::disconnect(m_image, SIGNAL(sourceSizeChanged()), this, SLOT(onSourceSizeChanged()));
+    reloadSource();
+}
+
 void UCQQuickImageExtension::reloadSource()
 {
     if (!m_image) {

=== modified file 'src/UbuntuToolkit/ucqquickimageextension_p.h'
--- src/UbuntuToolkit/ucqquickimageextension_p.h	2017-02-06 10:52:06 +0000
+++ src/UbuntuToolkit/ucqquickimageextension_p.h	2017-03-10 12:04:49 +0000
@@ -49,6 +49,7 @@
 
 protected Q_SLOTS:
     void reloadSource();
+    void onSourceSizeChanged();
 
 protected:
     bool rewriteSciFile(const QString &sciFilePath, const QString &scaleFactor, QTextStream& output);