diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-09 07:18:54 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-09 07:18:54 (GMT) |
commit | 06c286b74274166a47df20dc425f76051fb03d4d (patch) | |
tree | b2b8376b9844dbb5c24e0749d512d5e9c0cd1bea /tests/auto/declarative | |
parent | da8dda3a3b66fed6d5da878f3b4617aa0b5f3953 (diff) | |
download | Qt-06c286b74274166a47df20dc425f76051fb03d4d.zip Qt-06c286b74274166a47df20dc425f76051fb03d4d.tar.gz Qt-06c286b74274166a47df20dc425f76051fb03d4d.tar.bz2 |
Fix crash in QML library imports
QTBUG-9705
Diffstat (limited to 'tests/auto/declarative')
3 files changed, 25 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/libraryScriptAssert.js b/tests/auto/declarative/qdeclarativeecmascript/data/libraryScriptAssert.js new file mode 100644 index 0000000..3ffdb33 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeecmascript/data/libraryScriptAssert.js @@ -0,0 +1,6 @@ +.pragma library + +function test(target) +{ + var a = target.a; +} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/libraryScriptAssert.qml b/tests/auto/declarative/qdeclarativeecmascript/data/libraryScriptAssert.qml new file mode 100644 index 0000000..9e8408f --- /dev/null +++ b/tests/auto/declarative/qdeclarativeecmascript/data/libraryScriptAssert.qml @@ -0,0 +1,7 @@ +import Qt 4.6 +import "libraryScriptAssert.js" as Test + +QtObject { + id: root + Component.onCompleted: Test.test(root); +} diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp index c6bb276..d886e83 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp +++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp @@ -139,6 +139,7 @@ private slots: void regExpBug(); void nullObjectBinding(); void deletedEngine(); + void libraryScriptAssert(); void callQtInvokables(); private: @@ -2179,6 +2180,17 @@ void tst_qdeclarativeecmascript::deletedEngine() delete object; } +// Test the crashing part of QTBUG-9705 +void tst_qdeclarativeecmascript::libraryScriptAssert() +{ + QDeclarativeComponent component(&engine, TEST_FILE("libraryScriptAssert.qml")); + + QObject *object = component.create(); + QVERIFY(object != 0); + + delete object; +} + QTEST_MAIN(tst_qdeclarativeecmascript) #include "tst_qdeclarativeecmascript.moc" |