diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-09 02:32:22 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-09 02:32:22 (GMT) |
| commit | 2f653cc06b97b443b9832d0121dbf92b35dd32c2 (patch) | |
| tree | 5929efcc1e746414cac18e3a02e3d1bff59edd0e /tests | |
| parent | 64d94b747dfa2448d9ba0157fc2a44c13cf4b1d5 (diff) | |
| download | Qt-2f653cc06b97b443b9832d0121dbf92b35dd32c2.zip Qt-2f653cc06b97b443b9832d0121dbf92b35dd32c2.tar.gz Qt-2f653cc06b97b443b9832d0121dbf92b35dd32c2.tar.bz2 | |
Remove old implicit module support.
Previously, it was allowed to use type qualification to refer to types
defined in subdirectories - indeed, this was the only form of modularity.
This is no longer desirable since we have good import features.
Task-number: QTBUG-7721
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qmllanguage/data/subdir/subsubdir/SubTest.qml | 2 | ||||
| -rw-r--r-- | tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmllanguage/data/subdir/subsubdir/SubTest.qml b/tests/auto/declarative/qmllanguage/data/subdir/subsubdir/SubTest.qml new file mode 100644 index 0000000..c4d5905 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/subdir/subsubdir/SubTest.qml @@ -0,0 +1,2 @@ +import Qt 4.6 +Rectangle { } diff --git a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp index 606d4c6..357fc5f 100644 --- a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp +++ b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp @@ -1187,6 +1187,17 @@ void tst_qmllanguage::importsLocal_data() << "import Qt 4.6\nimport \"subdir\"\n" "Test {}" << "QmlGraphicsRectangle"; + QTest::newRow("local import subsubdir") + << "import Qt 4.6\nimport \"subdir/subsubdir\"\n" + "SubTest {}" + << "QmlGraphicsRectangle"; + QTest::newRow("local import QTBUG-7721 A") + << "subdir.Test {}" // no longer allowed (QTBUG-7721) + << ""; + QTest::newRow("local import QTBUG-7721 B") + << "import \"subdir\" as X\n" + "X.subsubdir.SubTest {}" // no longer allowed (QTBUG-7721) + << ""; QTest::newRow("local import as") << "import \"subdir\" as T\n" "T.Test {}" |