From e569fac3b23885aec1295cb1845a96ca6fca26e2 Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Wed, 9 Dec 2009 13:09:39 +1000 Subject: Inline QML still needs a URL so that subtypes are relative to that URL. Fixes tst_qmlecmascript::dynamicCreation --- src/declarative/qml/qmlengine.cpp | 2 ++ tests/auto/declarative/qmlqt/tst_qmlqt.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index 63d5b70..ad68c8f 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -680,6 +680,8 @@ QScriptValue QmlEnginePrivate::createQmlObject(QScriptContext *ctxt, QScriptEngi QUrl url; if(ctxt->argumentCount() > 2) url = QUrl(ctxt->argument(2).toString()); + else + url = QUrl("inline"); if (url.isValid() && url.isRelative()) url = context->resolvedUrl(url); diff --git a/tests/auto/declarative/qmlqt/tst_qmlqt.cpp b/tests/auto/declarative/qmlqt/tst_qmlqt.cpp index 21c5478..f184af0 100644 --- a/tests/auto/declarative/qmlqt/tst_qmlqt.cpp +++ b/tests/auto/declarative/qmlqt/tst_qmlqt.cpp @@ -327,7 +327,7 @@ void tst_qmlqt::createQmlObject() QString warning2 = " " + TEST_FILE("main.qml").toString() + ":4:1: Duplicate property name"; QString warning3 = "QmlEngine::createQmlObject(): Component is not ready"; QString warning4 = "QmlEngine::createQmlObject():"; - QString warning5 = " :3: Cannot assign object type QObject with no default method"; + QString warning5 = " " + TEST_FILE("inline").toString() + ":3: Cannot assign object type QObject with no default method"; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1)); QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2)); -- cgit v0.12