summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
diff options
context:
space:
mode:
authormae <qt-info@nokia.com>2010-03-18 14:54:02 (GMT)
committermae <qt-info@nokia.com>2010-03-19 15:18:53 (GMT)
commitd039e2e8307bd272eedc5beae4ecf1a14e47def5 (patch)
tree992d9b32eb494c3636ac7b09ecb6442d4ea0441f /tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
parent7ac2e0cf47628c5a7ea08a5e3058c8bc55fbdd46 (diff)
downloadQt-d039e2e8307bd272eedc5beae4ecf1a14e47def5.zip
Qt-d039e2e8307bd272eedc5beae4ecf1a14e47def5.tar.gz
Qt-d039e2e8307bd272eedc5beae4ecf1a14e47def5.tar.bz2
Fix local type lookup
This change removes the hacky final baseUrl+TypeName+".qml" lookup. In order to still support internal files in remote modules, a new qmldir keyword "internal" is introduced.
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp')
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index 6b564d4..9188d72 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -1242,6 +1242,9 @@ void tst_qdeclarativelanguage::importsRemote_data()
QTest::newRow("remote import") << "import \""+serverdir+"\"\nTest {}" << "QDeclarativeRectangle";
QTest::newRow("remote import with subdir") << "import \""+serverdir+"\"\nTestSubDir {}" << "QDeclarativeText";
QTest::newRow("remote import with local") << "import \""+serverdir+"\"\nTestLocal {}" << "QDeclarativeImage";
+ QTest::newRow("wrong remote import with undeclared local") << "import \""+serverdir+"\"\nWrongTestLocal {}" << "";
+ QTest::newRow("wrong remote import of internal local") << "import \""+serverdir+"\"\nLocalInternal {}" << "";
+ QTest::newRow("wrong remote import of undeclared local") << "import \""+serverdir+"\"\nUndeclaredLocal {}" << "";
}
#include "testhttpserver.h"