summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-09-29 02:14:44 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2010-10-01 05:29:23 (GMT)
commitc2c367ebeb039c42cb4fec50b2b6495624837978 (patch)
treed4b496f03ff675fa50ca5a8e1cacb44a002f7f72 /tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
parentdcc5c7ea047513ceb6fc75aac526b17ad6629d4c (diff)
downloadQt-c2c367ebeb039c42cb4fec50b2b6495624837978.zip
Qt-c2c367ebeb039c42cb4fec50b2b6495624837978.tar.gz
Qt-c2c367ebeb039c42cb4fec50b2b6495624837978.tar.bz2
Add test for Qt 4.7 module
Task-number: QTBUG-13799 Reviewed-by: Martin Jones (cherry picked from commit 6f35701275ab0cd80daec45b3407725b10571693)
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp')
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index f811555..c6b2302 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -1715,6 +1715,9 @@ void tst_qdeclarativelanguage::initTestCase()
{
registerTypes();
+ // Registering the TestType class in other modules should have no adverse effects
+ qmlRegisterType<TestType>("com.nokia.TestPre", 1, 0, "Test");
+
qmlRegisterType<TestType>("com.nokia.Test", 0, 0, "TestTP");
qmlRegisterType<TestType>("com.nokia.Test", 1, 0, "Test");
qmlRegisterType<TestType>("com.nokia.Test", 1, 5, "Test");
@@ -1722,6 +1725,9 @@ void tst_qdeclarativelanguage::initTestCase()
qmlRegisterType<TestType>("com.nokia.Test", 1, 9, "OldTest");
qmlRegisterType<TestType2>("com.nokia.Test", 1, 12, "Test");
+ // Registering the TestType class in other modules should have no adverse effects
+ qmlRegisterType<TestType>("com.nokia.TestPost", 1, 0, "Test");
+
// Create locale-specific file
// For POSIX, this will just be data/I18nType.qml, since POSIX is 7-bit
// For iso8859-1 locale, this will just be data/I18nType?????.qml where ????? is 5 8-bit characters