summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAlan Alpert <aalpert@rim.com>2012-12-05 18:34:50 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-08 21:59:21 (GMT)
commitf5b9d1817c798227fd6be688f11b7159d5b0492f (patch)
tree98cd7fe6e2210c78553aa388af190e408a935960 /tests
parentacfd489fb344d53463525c7b390cce7381f67b80 (diff)
downloadQt-f5b9d1817c798227fd6be688f11b7159d5b0492f.zip
Qt-f5b9d1817c798227fd6be688f11b7159d5b0492f.tar.gz
Qt-f5b9d1817c798227fd6be688f11b7159d5b0492f.tar.bz2
Remove 'com.nokia' string from autotest
Change-Id: I01347645cedc6f4ecaf3158ea8336b0672ac9a4a Backport-Of: Ic318dbe7a48412e9689ca0f4506c7098d9f48b5f Backport-Of: Ic318dbe7a48412e9689ca0f4506c7098d9f48b6a Reviewed-by: Alan Alpert <aalpert@rim.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/importIncorrectCase.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.errors.txt2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/InstalledTest.qml (renamed from tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml)0
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/InstalledTest2.qml (renamed from tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml)0
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/LocalLast.qml (renamed from tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/LocalLast.qml)0
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/PrivateType.qml (renamed from tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/PrivateType.qml)0
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/qmldir (renamed from tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/qmldir)0
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest0/InstalledTest.qml (renamed from tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml)0
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest0/InstalledTest2.qml (renamed from tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml)0
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest0/qmldir (renamed from tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/qmldir)0
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp154
12 files changed, 80 insertions, 80 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importIncorrectCase.qml b/tests/auto/declarative/qdeclarativelanguage/data/importIncorrectCase.qml
index 247f527..e7338a0 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/importIncorrectCase.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/importIncorrectCase.qml
@@ -1,5 +1,5 @@
import QtQuick 1.0
-import com.Nokia.installedtest 1.0
+import org.QtProject.installedtest 1.0
QtObject {
}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.errors.txt
index 89e58ee..59b0b87 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.errors.txt
@@ -1 +1 @@
-1:35:Library import requires a version
+1:39:Library import requires a version
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.qml b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.qml
index 97ec222..6ad2a81 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.qml
@@ -1,3 +1,3 @@
-import com.nokia.installedtest as T
+import org.qtproject.installedtest as T
T.InstalledTest {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/InstalledTest.qml
index 9985d33..9985d33 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/InstalledTest.qml
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/InstalledTest2.qml
index f63283e..f63283e 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/InstalledTest2.qml
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/LocalLast.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/LocalLast.qml
index 7f491eb..7f491eb 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/LocalLast.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/LocalLast.qml
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/PrivateType.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/PrivateType.qml
index 03bf25b..03bf25b 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/PrivateType.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/PrivateType.qml
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/qmldir b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/qmldir
index d15720a..d15720a 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/qmldir
+++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/qmldir
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest0/InstalledTest.qml
index 9985d33..9985d33 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest0/InstalledTest.qml
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest0/InstalledTest2.qml
index f63283e..f63283e 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest0/InstalledTest2.qml
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/qmldir b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest0/qmldir
index b301226..b301226 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/qmldir
+++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest0/qmldir
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index f17b9a3..40ff989 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -1448,101 +1448,101 @@ void tst_qdeclarativelanguage::importsBuiltin_data()
<< ""
<< "Test is not a type";
QTest::newRow("not in version 0.0")
- << "import com.nokia.Test 0.0\n"
+ << "import org.qtproject.Test 0.0\n"
"Test {}"
<< ""
<< "Test is not a type";
QTest::newRow("version not installed")
- << "import com.nokia.Test 99.0\n"
+ << "import org.qtproject.Test 99.0\n"
"Test {}"
<< ""
- << "module \"com.nokia.Test\" version 99.0 is not installed";
+ << "module \"org.qtproject.Test\" version 99.0 is not installed";
QTest::newRow("in version 0.0")
- << "import com.nokia.Test 0.0\n"
+ << "import org.qtproject.Test 0.0\n"
"TestTP {}"
<< "TestType"
<< "";
QTest::newRow("qualified in version 0.0")
- << "import com.nokia.Test 0.0 as T\n"
+ << "import org.qtproject.Test 0.0 as T\n"
"T.TestTP {}"
<< "TestType"
<< "";
QTest::newRow("in version 1.0")
- << "import com.nokia.Test 1.0\n"
+ << "import org.qtproject.Test 1.0\n"
"Test {}"
<< "TestType"
<< "";
QTest::newRow("qualified wrong")
- << "import com.nokia.Test 1.0 as T\n" // QT-610
+ << "import org.qtproject.Test 1.0 as T\n" // QT-610
"Test {}"
<< ""
<< "Test is not a type";
QTest::newRow("qualified right")
- << "import com.nokia.Test 1.0 as T\n"
+ << "import org.qtproject.Test 1.0 as T\n"
"T.Test {}"
<< "TestType"
<< "";
QTest::newRow("qualified right but not in version 0.0")
- << "import com.nokia.Test 0.0 as T\n"
+ << "import org.qtproject.Test 0.0 as T\n"
"T.Test {}"
<< ""
<< "T.Test is not a type";
QTest::newRow("in version 1.1")
- << "import com.nokia.Test 1.1\n"
+ << "import org.qtproject.Test 1.1\n"
"Test {}"
<< "TestType"
<< "";
QTest::newRow("in version 1.3")
- << "import com.nokia.Test 1.3\n"
+ << "import org.qtproject.Test 1.3\n"
"Test {}"
<< "TestType"
<< "";
QTest::newRow("in version 1.5")
- << "import com.nokia.Test 1.5\n"
+ << "import org.qtproject.Test 1.5\n"
"Test {}"
<< "TestType"
<< "";
QTest::newRow("changed in version 1.8")
- << "import com.nokia.Test 1.8\n"
+ << "import org.qtproject.Test 1.8\n"
"Test {}"
<< "TestType2"
<< "";
QTest::newRow("in version 1.12")
- << "import com.nokia.Test 1.12\n"
+ << "import org.qtproject.Test 1.12\n"
"Test {}"
<< "TestType2"
<< "";
QTest::newRow("old in version 1.9")
- << "import com.nokia.Test 1.9\n"
+ << "import org.qtproject.Test 1.9\n"
"OldTest {}"
<< "TestType"
<< "";
QTest::newRow("old in version 1.11")
- << "import com.nokia.Test 1.11\n"
+ << "import org.qtproject.Test 1.11\n"
"OldTest {}"
<< "TestType"
<< "";
QTest::newRow("multiversion 1")
- << "import com.nokia.Test 1.11\n"
- "import com.nokia.Test 1.12\n"
+ << "import org.qtproject.Test 1.11\n"
+ "import org.qtproject.Test 1.12\n"
"Test {}"
<< (!qmlCheckTypes()?"TestType2":"")
- << (!qmlCheckTypes()?"":"Test is ambiguous. Found in com/nokia/Test in version 1.12 and 1.11");
+ << (!qmlCheckTypes()?"":"Test is ambiguous. Found in org/qtproject/Test in version 1.12 and 1.11");
QTest::newRow("multiversion 2")
- << "import com.nokia.Test 1.11\n"
- "import com.nokia.Test 1.12\n"
+ << "import org.qtproject.Test 1.11\n"
+ "import org.qtproject.Test 1.12\n"
"OldTest {}"
<< (!qmlCheckTypes()?"TestType":"")
- << (!qmlCheckTypes()?"":"OldTest is ambiguous. Found in com/nokia/Test in version 1.12 and 1.11");
+ << (!qmlCheckTypes()?"":"OldTest is ambiguous. Found in org/qtproject/Test in version 1.12 and 1.11");
QTest::newRow("qualified multiversion 3")
- << "import com.nokia.Test 1.0 as T0\n"
- "import com.nokia.Test 1.8 as T8\n"
+ << "import org.qtproject.Test 1.0 as T0\n"
+ "import org.qtproject.Test 1.8 as T8\n"
"T0.Test {}"
<< "TestType"
<< "";
QTest::newRow("qualified multiversion 4")
- << "import com.nokia.Test 1.0 as T0\n"
- "import com.nokia.Test 1.8 as T8\n"
+ << "import org.qtproject.Test 1.0 as T0\n"
+ "import org.qtproject.Test 1.8 as T8\n"
"T8.Test {}"
<< "TestType2"
<< "";
@@ -1599,10 +1599,10 @@ void tst_qdeclarativelanguage::importsLocal_data()
<< "Test is not a type";
QTest::newRow("library precedence over local import")
<< "import \"subdir\"\n"
- "import com.nokia.Test 1.0\n"
+ "import org.qtproject.Test 1.0\n"
"Test {}"
<< (!qmlCheckTypes()?"TestType":"")
- << (!qmlCheckTypes()?"":"Test is ambiguous. Found in com/nokia/Test and in subdir");
+ << (!qmlCheckTypes()?"":"Test is ambiguous. Found in org/qtproject/Test and in subdir");
}
void tst_qdeclarativelanguage::importsLocal()
@@ -1692,47 +1692,47 @@ void tst_qdeclarativelanguage::importsInstalled_data()
// import installed
QTest::newRow("installed import 0")
- << "import com.nokia.installedtest0 0.0\n"
+ << "import org.qtproject.installedtest0 0.0\n"
"InstalledTestTP {}"
<< "QDeclarativeRectangle"
<< "";
QTest::newRow("installed import 0 as TP")
- << "import com.nokia.installedtest0 0.0 as TP\n"
+ << "import org.qtproject.installedtest0 0.0 as TP\n"
"TP.InstalledTestTP {}"
<< "QDeclarativeRectangle"
<< "";
QTest::newRow("installed import 1")
- << "import com.nokia.installedtest 1.0\n"
+ << "import org.qtproject.installedtest 1.0\n"
"InstalledTest {}"
<< "QDeclarativeRectangle"
<< "";
QTest::newRow("installed import 2")
- << "import com.nokia.installedtest 1.3\n"
+ << "import org.qtproject.installedtest 1.3\n"
"InstalledTest {}"
<< "QDeclarativeRectangle"
<< "";
QTest::newRow("installed import 3")
- << "import com.nokia.installedtest 1.4\n"
+ << "import org.qtproject.installedtest 1.4\n"
"InstalledTest {}"
<< "QDeclarativeText"
<< "";
QTest::newRow("installed import minor version not available") // QTBUG-11936
- << "import com.nokia.installedtest 0.1\n"
+ << "import org.qtproject.installedtest 0.1\n"
"InstalledTest {}"
<< ""
- << "module \"com.nokia.installedtest\" version 0.1 is not installed";
+ << "module \"org.qtproject.installedtest\" version 0.1 is not installed";
QTest::newRow("installed import minor version not available") // QTBUG-9627
- << "import com.nokia.installedtest 1.10\n"
+ << "import org.qtproject.installedtest 1.10\n"
"InstalledTest {}"
<< ""
- << "module \"com.nokia.installedtest\" version 1.10 is not installed";
+ << "module \"org.qtproject.installedtest\" version 1.10 is not installed";
QTest::newRow("installed import major version not available") // QTBUG-9627
- << "import com.nokia.installedtest 9.0\n"
+ << "import org.qtproject.installedtest 9.0\n"
"InstalledTest {}"
<< ""
- << "module \"com.nokia.installedtest\" version 9.0 is not installed";
+ << "module \"org.qtproject.installedtest\" version 9.0 is not installed";
QTest::newRow("installed import visibility") // QT-614
- << "import com.nokia.installedtest 1.4\n"
+ << "import org.qtproject.installedtest 1.4\n"
"PrivateType {}"
<< ""
<< "PrivateType is not a type";
@@ -1754,60 +1754,60 @@ void tst_qdeclarativelanguage::importsOrder_data()
QTest::addColumn<QString>("error");
QTest::newRow("double import") <<
- "import com.nokia.installedtest 1.4\n"
- "import com.nokia.installedtest 1.4\n"
+ "import org.qtproject.installedtest 1.4\n"
+ "import org.qtproject.installedtest 1.4\n"
"InstalledTest {}"
<< (!qmlCheckTypes()?"QDeclarativeText":"")
- << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/com/nokia/installedtest in version 1.4 and 1.4");
+ << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/org/qtproject/installedtest in version 1.4 and 1.4");
QTest::newRow("installed import overrides 1") <<
- "import com.nokia.installedtest 1.0\n"
- "import com.nokia.installedtest 1.4\n"
+ "import org.qtproject.installedtest 1.0\n"
+ "import org.qtproject.installedtest 1.4\n"
"InstalledTest {}"
<< (!qmlCheckTypes()?"QDeclarativeText":"")
- << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/com/nokia/installedtest in version 1.4 and 1.0");
+ << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/org/qtproject/installedtest in version 1.4 and 1.0");
QTest::newRow("installed import overrides 2") <<
- "import com.nokia.installedtest 1.4\n"
- "import com.nokia.installedtest 1.0\n"
+ "import org.qtproject.installedtest 1.4\n"
+ "import org.qtproject.installedtest 1.0\n"
"InstalledTest {}"
<< (!qmlCheckTypes()?"QDeclarativeRectangle":"")
- << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/com/nokia/installedtest in version 1.0 and 1.4");
+ << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/org/qtproject/installedtest in version 1.0 and 1.4");
QTest::newRow("installed import re-overrides 1") <<
- "import com.nokia.installedtest 1.4\n"
- "import com.nokia.installedtest 1.0\n"
- "import com.nokia.installedtest 1.4\n"
+ "import org.qtproject.installedtest 1.4\n"
+ "import org.qtproject.installedtest 1.0\n"
+ "import org.qtproject.installedtest 1.4\n"
"InstalledTest {}"
<< (!qmlCheckTypes()?"QDeclarativeText":"")
- << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/com/nokia/installedtest in version 1.4 and 1.0");
+ << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/org/qtproject/installedtest in version 1.4 and 1.0");
QTest::newRow("installed import re-overrides 2") <<
- "import com.nokia.installedtest 1.4\n"
- "import com.nokia.installedtest 1.0\n"
- "import com.nokia.installedtest 1.4\n"
- "import com.nokia.installedtest 1.0\n"
+ "import org.qtproject.installedtest 1.4\n"
+ "import org.qtproject.installedtest 1.0\n"
+ "import org.qtproject.installedtest 1.4\n"
+ "import org.qtproject.installedtest 1.0\n"
"InstalledTest {}"
<< (!qmlCheckTypes()?"QDeclarativeRectangle":"")
- << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/com/nokia/installedtest in version 1.0 and 1.4");
+ << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/org/qtproject/installedtest in version 1.0 and 1.4");
QTest::newRow("installed import versus builtin 1") <<
- "import com.nokia.installedtest 1.5\n"
+ "import org.qtproject.installedtest 1.5\n"
"import QtQuick 1.0\n"
"Rectangle {}"
<< (!qmlCheckTypes()?"QDeclarativeRectangle":"")
- << (!qmlCheckTypes()?"":"Rectangle is ambiguous. Found in Qt and in lib/com/nokia/installedtest");
+ << (!qmlCheckTypes()?"":"Rectangle is ambiguous. Found in Qt and in lib/org/qtproject/installedtest");
QTest::newRow("installed import versus builtin 2") <<
"import QtQuick 1.0\n"
- "import com.nokia.installedtest 1.5\n"
+ "import org.qtproject.installedtest 1.5\n"
"Rectangle {}"
<< (!qmlCheckTypes()?"QDeclarativeText":"")
- << (!qmlCheckTypes()?"":"Rectangle is ambiguous. Found in lib/com/nokia/installedtest and in Qt");
+ << (!qmlCheckTypes()?"":"Rectangle is ambiguous. Found in lib/org/qtproject/installedtest and in Qt");
QTest::newRow("namespaces cannot be overridden by types 1") <<
"import QtQuick 1.0 as Rectangle\n"
- "import com.nokia.installedtest 1.5\n"
+ "import org.qtproject.installedtest 1.5\n"
"Rectangle {}"
<< ""
<< "Namespace Rectangle cannot be used as a type";
QTest::newRow("namespaces cannot be overridden by types 2") <<
"import QtQuick 1.0 as Rectangle\n"
- "import com.nokia.installedtest 1.5\n"
+ "import org.qtproject.installedtest 1.5\n"
"Rectangle.Image {}"
<< "QDeclarativeImage"
<< "";
@@ -1816,10 +1816,10 @@ void tst_qdeclarativelanguage::importsOrder_data()
<< "QDeclarativeText"
<< "";
QTest::newRow("local last 2") <<
- "import com.nokia.installedtest 1.0\n"
+ "import org.qtproject.installedtest 1.0\n"
"LocalLast {}"
- << (!qmlCheckTypes()?"QDeclarativeRectangle":"")// i.e. from com.nokia.installedtest, not data/LocalLast.qml
- << (!qmlCheckTypes()?"":"LocalLast is ambiguous. Found in lib/com/nokia/installedtest and in local directory");
+ << (!qmlCheckTypes()?"QDeclarativeRectangle":"")// i.e. from org.qtproject.installedtest, not data/LocalLast.qml
+ << (!qmlCheckTypes()?"":"LocalLast is ambiguous. Found in lib/org/qtproject/installedtest and in local directory");
}
void tst_qdeclarativelanguage::importsOrder()
@@ -1838,9 +1838,9 @@ void tst_qdeclarativelanguage::importIncorrectCase()
QCOMPARE(errors.count(), 1);
#if defined(Q_OS_MAC) || defined(Q_OS_WIN32)
- QString expectedError = QLatin1String("cannot load module \"com.Nokia.installedtest\": File name case mismatch for \"") + QFileInfo(__FILE__).absoluteDir().filePath("data/lib/com/Nokia/installedtest/qmldir") + QLatin1String("\"");
+ QString expectedError = QLatin1String("cannot load module \"org.QtProject.installedtest\": File name case mismatch for \"") + QFileInfo(__FILE__).absoluteDir().filePath("data/lib/org/QtProject/installedtest/qmldir") + QLatin1String("\"");
#else
- QString expectedError = QLatin1String("module \"com.Nokia.installedtest\" is not installed");
+ QString expectedError = QLatin1String("module \"org.QtProject.installedtest\" is not installed");
#endif
QCOMPARE(errors.at(0).description(), expectedError);
@@ -1973,17 +1973,17 @@ 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>("org.qtproject.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");
- qmlRegisterType<TestType2>("com.nokia.Test", 1, 8, "Test");
- qmlRegisterType<TestType>("com.nokia.Test", 1, 9, "OldTest");
- qmlRegisterType<TestType2>("com.nokia.Test", 1, 12, "Test");
+ qmlRegisterType<TestType>("org.qtproject.Test", 0, 0, "TestTP");
+ qmlRegisterType<TestType>("org.qtproject.Test", 1, 0, "Test");
+ qmlRegisterType<TestType>("org.qtproject.Test", 1, 5, "Test");
+ qmlRegisterType<TestType2>("org.qtproject.Test", 1, 8, "Test");
+ qmlRegisterType<TestType>("org.qtproject.Test", 1, 9, "OldTest");
+ qmlRegisterType<TestType2>("org.qtproject.Test", 1, 12, "Test");
// Registering the TestType class in other modules should have no adverse effects
- qmlRegisterType<TestType>("com.nokia.TestPost", 1, 0, "Test");
+ qmlRegisterType<TestType>("org.qtproject.TestPost", 1, 0, "Test");
// Create locale-specific file
// For POSIX, this will just be data/I18nType.qml, since POSIX is 7-bit