summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-09-01 03:04:40 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-09-01 03:04:40 (GMT)
commit44ab46a6c5dcfb14395baf173a11179839003c4c (patch)
tree9dcabdcb0ef809a05abefd39f24724135cc16412
parent25e4d7e6aa13cb46c2afc132e8371f250971420d (diff)
downloadQt-44ab46a6c5dcfb14395baf173a11179839003c4c.zip
Qt-44ab46a6c5dcfb14395baf173a11179839003c4c.tar.gz
Qt-44ab46a6c5dcfb14395baf173a11179839003c4c.tar.bz2
Modularity documentation, and refinement of import order semantics. With tests.
-rw-r--r--tests/auto/declarative/qmlparser/importNamespaceConflict.errors.txt1
-rw-r--r--tests/auto/declarative/qmlparser/importNamespaceConflict.qml4
2 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmlparser/importNamespaceConflict.errors.txt b/tests/auto/declarative/qmlparser/importNamespaceConflict.errors.txt
new file mode 100644
index 0000000..231998d
--- /dev/null
+++ b/tests/auto/declarative/qmlparser/importNamespaceConflict.errors.txt
@@ -0,0 +1 @@
+4:1:Namespace Rectangle cannot be used as a type
diff --git a/tests/auto/declarative/qmlparser/importNamespaceConflict.qml b/tests/auto/declarative/qmlparser/importNamespaceConflict.qml
new file mode 100644
index 0000000..cd112af
--- /dev/null
+++ b/tests/auto/declarative/qmlparser/importNamespaceConflict.qml
@@ -0,0 +1,4 @@
+import Test 1.0 as Rectangle
+import Qt 4.6
+
+Rectangle { }