diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-10-28 05:13:31 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-10-28 05:13:31 (GMT) |
| commit | cbc205d5b1fada56e2de82fa7c971ac7cefdf3fe (patch) | |
| tree | 795817190fbdc0fd482822fbcdb7af7b59d5344c | |
| parent | 01885076b037bdd6624744fe67b7de849f26fef3 (diff) | |
| download | Qt-cbc205d5b1fada56e2de82fa7c971ac7cefdf3fe.zip Qt-cbc205d5b1fada56e2de82fa7c971ac7cefdf3fe.tar.gz Qt-cbc205d5b1fada56e2de82fa7c971ac7cefdf3fe.tar.bz2 | |
Test visibility.
Add refs back to JIRA items.
| -rw-r--r-- | tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/PrivateType.qml | 2 | ||||
| -rw-r--r-- | tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp | 18 |
2 files changed, 16 insertions, 4 deletions
diff --git a/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/PrivateType.qml b/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/PrivateType.qml new file mode 100644 index 0000000..93c7630 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/PrivateType.qml @@ -0,0 +1,2 @@ +import Qt 4.6 +Image {} diff --git a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp index 78c66ad..6494c40 100644 --- a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp +++ b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp @@ -831,8 +831,12 @@ QML_DEFINE_TYPE(com.nokia.Test, 1, 8, 9, Test, TestType2) QML_DEFINE_TYPE(com.nokia.Test, 1, 12, 13, Test, TestType2) QML_DEFINE_TYPE(com.nokia.Test, 1, 9, 11, OldTest, TestType) +// Import tests (QT-558) + void tst_qmllanguage::importsBuiltin_data() { + // QT-610 + QTest::addColumn<QString>("qml"); QTest::addColumn<QString>("type"); @@ -849,7 +853,7 @@ void tst_qmllanguage::importsBuiltin_data() "Test {}" << "TestType"; QTest::newRow("qualified wrong") - << "import com.nokia.Test 1.0 as T\n" + << "import com.nokia.Test 1.0 as T\n" // QT-610 "Test {}" << ""; QTest::newRow("qualified right") @@ -941,7 +945,7 @@ void tst_qmllanguage::importsLocal_data() // import locals QTest::newRow("local import") - << "import \"subdir\"\n" + << "import \"subdir\"\n" // QT-613 "Test {}" << "QFxRect"; QTest::newRow("local import as") @@ -989,18 +993,24 @@ void tst_qmllanguage::importsRemote() void tst_qmllanguage::importsInstalled_data() { + // QT-610 + QTest::addColumn<QString>("qml"); QTest::addColumn<QString>("type"); // import installed - QTest::newRow("installed import") + QTest::newRow("installed import 1") << "import com.nokia.installedtest 1.0\n" "InstalledTest {}" << "QFxRect"; - QTest::newRow("installed import") + QTest::newRow("installed import 2") << "import com.nokia.installedtest 1.4\n" "InstalledTest {}" << "QFxText"; + QTest::newRow("installed import visibility") // QT-614 + << "import com.nokia.installedtest 1.4\n" + "PrivateType {}" + << ""; } void tst_qmllanguage::importsInstalled() |