Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/stateSaverUrlType into lp:ubuntu-ui-toolkit/staging

[Christian Dywan]

QQmlContextData.url is a method in 5.5.0

[Timo Jyrinki (timo-jyrinki)]

Looking good! That bug seems resolved.... even though there's the next one around the corner (bug #1466484 just filed).

Build log showing it going fine all the way to the install phase where it then fails: https://launchpadlibrarian.net/209420305/buildlog_ubuntu-wily-amd64.ubuntu-ui-toolkit_1.3.1517%2B15.10.20150523-0ubuntu4~wily1~test1~qt550beta%2Bfix1_BUILDING.txt.gz

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1536
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1918/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3248
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/646
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/648
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/648/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/645
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2713
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3246
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3246/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21283

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1918/rebuild

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/plugin/ucstatesaver.cpp'
--- modules/Ubuntu/Components/plugin/ucstatesaver.cpp	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/plugin/ucstatesaver.cpp	2015-06-18 11:30:52 +0000
@@ -81,8 +81,13 @@
 {
     QQmlContext *attacheeContext = qmlContext(m_attachee);
     QQmlContextData *cdata = QQmlContextData::get(attacheeContext);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
+    QUrl url(cdata->url());
+#else
+    QUrl url(cdata->url);
+#endif
     QQmlData *ddata = QQmlData::get(m_attachee);
-    QString path = cdata->url.path().replace('/', '_') + ':'
+    QString path = url.path().replace('/', '_') + ':'
             + QString::number(ddata->lineNumber) + ':'
             + QString::number(ddata->columnNumber) + ':' + id;
     QObject *parent = m_attachee->parent();