Merge lp:~timo-jyrinki/ubuntu-ui-toolkit/ucstylehints_qt55 into lp:ubuntu-ui-toolkit/staging

[Timo Jyrinki]

Fix ucstylehints.cpp compilation with Qt 5.5

[Timo Jyrinki (timo-jyrinki)]

Ok now it's "good", fails only later https://launchpadlibrarian.net/211518910/buildlog_ubuntu-wily-i386.ubuntu-ui-toolkit_1.3.1549%2B15.10.20150713.1-0ubuntu1_BUILDING.txt.gz

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1559
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1980/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/708
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/710
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/710/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/707

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

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

Small fix and we're good.

review: Needs Fixing

[lp:~timo-jyrinki/ubuntu-ui-toolkit/ucstylehints_qt55]

1560. By Timo Jyrinki on 2015-07-13

Address review comments.

[Zsombor Egri (zsombi)]

Still needs more love :)

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1560
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1985/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/713/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/715/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/712/console

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

review: Needs Fixing (continuous-integration)

[lp:~timo-jyrinki/ubuntu-ui-toolkit/ucstylehints_qt55]

1561. By Timo Jyrinki on 2015-07-13

Address review comments ^2

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1561
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1988/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/716
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/718
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/718/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/715

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

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

That's my boy ;)

review: Approve

=== modified file 'modules/Ubuntu/Components/plugin/ucstylehints.cpp'
--- modules/Ubuntu/Components/plugin/ucstylehints.cpp	2015-06-02 15:21:00 +0000
+++ modules/Ubuntu/Components/plugin/ucstylehints.cpp	2015-07-13 15:02:09 +0000
@@ -100,10 +100,17 @@
         int column = -1;
 
         QQmlData *ddata = QQmlData::get(this);
-        if (ddata && ddata->outerContext && !ddata->outerContext->url.isEmpty()) {
-            url = ddata->outerContext->url;
-            line = ddata->lineNumber;
-            column = ddata->columnNumber;
+        if (ddata && ddata->outerContext) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
+            QUrl outerContextUrl(ddata->outerContext->url());
+#else
+            QUrl outerContextUrl(ddata->outerContext->url);
+#endif
+            if (!outerContextUrl.isEmpty()) {
+                url = outerContextUrl;
+                line = ddata->lineNumber;
+                column = ddata->columnNumber;
+            }
         }
         m_expressions << Expression(propertyName, binding->value.compiledScriptIndex, expression, url, line, column);
         break;