aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/qml/qml/qqmlscriptblob.cpp2
-rw-r--r--src/qml/qml/qqmlscriptdata.cpp2
-rw-r--r--src/qml/qml/qqmlscriptdata_p.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlscriptblob.cpp b/src/qml/qml/qqmlscriptblob.cpp
index 4a11bffb15..646ffa3201 100644
--- a/src/qml/qml/qqmlscriptblob.cpp
+++ b/src/qml/qml/qqmlscriptblob.cpp
@@ -160,7 +160,7 @@ void QQmlScriptBlob::done()
for (int scriptIndex = 0; scriptIndex < m_scripts.size(); ++scriptIndex) {
const ScriptReference &script = m_scripts.at(scriptIndex);
- m_scriptData->scripts.append(script.script);
+ m_scriptData->scripts.append(script.script->scriptData());
if (!script.nameSpace.isNull()) {
if (!ns.contains(script.nameSpace)) {
diff --git a/src/qml/qml/qqmlscriptdata.cpp b/src/qml/qml/qqmlscriptdata.cpp
index 29aac49888..06556c0c22 100644
--- a/src/qml/qml/qqmlscriptdata.cpp
+++ b/src/qml/qml/qqmlscriptdata.cpp
@@ -57,7 +57,7 @@ QQmlRefPointer<QQmlContextData> QQmlScriptData::qmlContextDataForContext(
}
QV4::ScopedValue v(scope);
for (int ii = 0; ii < scripts.size(); ++ii) {
- v = scripts.at(ii)->scriptData()->scriptValueForContext(qmlContextData);
+ v = scripts.at(ii)->scriptValueForContext(qmlContextData);
scriptsArray->put(ii, v);
}
diff --git a/src/qml/qml/qqmlscriptdata_p.h b/src/qml/qml/qqmlscriptdata_p.h
index 21976df6f9..6eb3171505 100644
--- a/src/qml/qml/qqmlscriptdata_p.h
+++ b/src/qml/qml/qqmlscriptdata_p.h
@@ -40,7 +40,7 @@ public:
QUrl url;
QString urlString;
QQmlRefPointer<QQmlTypeNameCache> typeNameCache;
- QVector<QQmlRefPointer<QQmlScriptBlob>> scripts;
+ QVector<QQmlRefPointer<QQmlScriptData>> scripts;
QV4::ReturnedValue scriptValueForContext(const QQmlRefPointer<QQmlContextData> &parentCtxt);