diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-27 02:58:21 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-27 02:58:52 (GMT) |
| commit | b69864da59c42a09a3acc373eb77a85f8f8c93b2 (patch) | |
| tree | bcf8e8b260831b898abbd3dd0e8dbd0b969b24d8 /tests/auto/declarative/qdeclarativelanguage/data | |
| parent | ab7a0034af5f775fffc6003412bc895148181a87 (diff) | |
| download | Qt-b69864da59c42a09a3acc373eb77a85f8f8c93b2.zip Qt-b69864da59c42a09a3acc373eb77a85f8f8c93b2.tar.gz Qt-b69864da59c42a09a3acc373eb77a85f8f8c93b2.tar.bz2 | |
Disallow "Qt" as namespace import
This conflicts with the global object's "Qt" property.
QTBUG-10143
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage/data')
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignToNamespace.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignToNamespace.qml index 8eb9768..2f49418 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/assignToNamespace.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/assignToNamespace.qml @@ -1,5 +1,5 @@ -import Qt 4.7 as Qt +import Qt 4.7 as Qt47 -Qt.QtObject { - Qt: 10 +Qt47.QtObject { + Qt47: 10 } diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml index e870046..c997356 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml @@ -1,6 +1,6 @@ import Test 1.0 import Qt 4.7 -import Qt 4.7 as Qt +import Qt 4.7 as Qt47 QtObject { property QtObject objectProperty diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml index 6d33361..303b5a5 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml @@ -1,2 +1,2 @@ -import Qt 4.7 as Qt -Qt.Rectangle {} +import Qt 4.7 as Qt47 +Qt47.Rectangle {} |