1
=== modified file 'modules/Ubuntu/Components/plugin/ucstylehints.cpp'
2
--- modules/Ubuntu/Components/plugin/ucstylehints.cpp	2015-06-02 15:21:00 +0000
3
+++ modules/Ubuntu/Components/plugin/ucstylehints.cpp	2015-07-13 15:02:09 +0000
4
@@ -100,10 +100,17 @@
5
100
        int column = -1;
100
        int column = -1;
6
101
101
7
102
        QQmlData *ddata = QQmlData::get(this);
102
        QQmlData *ddata = QQmlData::get(this);
12
103
        if (ddata && ddata->outerContext && !ddata->outerContext->url.isEmpty()) {
103
        if (ddata && ddata->outerContext) {
13
104
            url = ddata->outerContext->url;
104
#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
14
105
            line = ddata->lineNumber;
105
            QUrl outerContextUrl(ddata->outerContext->url());
15
106
            column = ddata->columnNumber;
106
#else
16
107
            QUrl outerContextUrl(ddata->outerContext->url);
17
108
#endif
18
109
            if (!outerContextUrl.isEmpty()) {
19
110
                url = outerContextUrl;
20
111
                line = ddata->lineNumber;
21
112
                column = ddata->columnNumber;
22
113
            }
23
107
        }
114
        }
24
108
        m_expressions << Expression(propertyName, binding->value.compiledScriptIndex, expression, url, line, column);
115
        m_expressions << Expression(propertyName, binding->value.compiledScriptIndex, expression, url, line, column);
25
109
        break;
116
        break;
Reviewer	Review Type	Date Requested	Status
Zsombor Egri		2015-07-13	Approve on 2015-07-13
PS Jenkins bot	continuous-integration		Approve on 2015-07-13
Review via email: mp+264517@code.launchpad.net