diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmltypeloader.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickloader.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index 1928bcb4b5..b335d6f402 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -664,7 +664,7 @@ void QQmlComponentPrivate::loadUrl(const QUrl &newUrl, QQmlComponent::Compilatio if (newUrl.isEmpty()) { QQmlError error; - error.setDescription(q->tr("Invalid empty URL")); + error.setDescription(QQmlComponent::tr("Invalid empty URL")); state.errors << error; return; } diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index dc63db1dea..aa7a2d95c7 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -2289,7 +2289,7 @@ void QQmlScriptBlob::done() error.setUrl(finalUrl()); error.setLine(script.location.line); error.setColumn(script.location.column); - error.setDescription(typeLoader()->tr("Script %1 unavailable").arg(script.script->url().toString())); + error.setDescription(QQmlTypeLoader::tr("Script %1 unavailable").arg(script.script->url().toString())); errors.prepend(error); setError(errors); } diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp index 210132effc..61f9a27d3b 100644 --- a/src/quick/items/qquickloader.cpp +++ b/src/quick/items/qquickloader.cpp @@ -941,7 +941,7 @@ v8::Handle<v8::Object> QQuickLoaderPrivate::extractInitialPropertyValues(QQmlV8F v8::Local<v8::Value> v = (*args)[1]; if (!v->IsObject() || v->IsArray()) { *error = true; - qmlInfo(loader) << loader->tr("setSource: value is not an object"); + qmlInfo(loader) << QQuickLoader::tr("setSource: value is not an object"); } else { *error = false; valuemap = v8::Local<v8::Object>::Cast(v); |