Remove 'com.nokia' string from autotest

Change-Id: Ic318dbe7a48412e9689ca0f4506c7098d9f48b5e
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>

diff --git a/tests/auto/qml/qqmllanguage/data/importJs.1.qml b/tests/auto/qml/qqmllanguage/data/importJs.1.qml
index eaba98e..89344c0 100644 (file)
--- a/tests/auto/qml/qqmllanguage/data/importJs.1.qml
+++ b/tests/auto/qml/qqmllanguage/data/importJs.1.qml
@@ -1,4 +1,4 @@
-import com.nokia.PureJsModule 1.0
+import org.qtproject.PureJsModule 1.0
 import QtQuick 2.0
 
 Item {

diff --git a/tests/auto/qml/qqmllanguage/data/importJs.10.qml b/tests/auto/qml/qqmllanguage/data/importJs.10.qml
index 578ca47..c0bb730 100644 (file)
--- a/tests/auto/qml/qqmllanguage/data/importJs.10.qml
+++ b/tests/auto/qml/qqmllanguage/data/importJs.10.qml
@@ -1,5 +1,5 @@
-import com.nokia.PureJsModule 1.0 as PJM
-import com.nokia.PureJsModule 1.0 as AnotherName
+import org.qtproject.PureJsModule 1.0 as PJM
+import org.qtproject.PureJsModule 1.0 as AnotherName
 import QtQuick 2.0
 
 Item {

diff --git a/tests/auto/qml/qqmllanguage/data/importJs.2.qml b/tests/auto/qml/qqmllanguage/data/importJs.2.qml
index dd3d65c..5a0659f 100644 (file)
--- a/tests/auto/qml/qqmllanguage/data/importJs.2.qml
+++ b/tests/auto/qml/qqmllanguage/data/importJs.2.qml
@@ -1,4 +1,4 @@
-import com.nokia.VersionedOnlyJsModule 9.0
+import org.qtproject.VersionedOnlyJsModule 9.0
 import QtQuick 2.0
 
 Item {

diff --git a/tests/auto/qml/qqmllanguage/data/importJs.3.qml b/tests/auto/qml/qqmllanguage/data/importJs.3.qml
index f59d445..e241d61 100644 (file)
--- a/tests/auto/qml/qqmllanguage/data/importJs.3.qml
+++ b/tests/auto/qml/qqmllanguage/data/importJs.3.qml
@@ -1,4 +1,4 @@
-import com.nokia.PureJsModule 1.0
+import org.qtproject.PureJsModule 1.0
 import QtQuick 2.0
 
 Item {

diff --git a/tests/auto/qml/qqmllanguage/data/importJs.4.qml b/tests/auto/qml/qqmllanguage/data/importJs.4.qml
index e7b74ba..d323cfa 100644 (file)
--- a/tests/auto/qml/qqmllanguage/data/importJs.4.qml
+++ b/tests/auto/qml/qqmllanguage/data/importJs.4.qml
@@ -1,4 +1,4 @@
-import com.nokia.PureJsModule 1.6
+import org.qtproject.PureJsModule 1.6
 import QtQuick 2.0
 
 Item {

diff --git a/tests/auto/qml/qqmllanguage/data/importJs.5.errors.txt b/tests/auto/qml/qqmllanguage/data/importJs.5.errors.txt
index 10dbc80..7f8648b 100644 (file)
--- a/tests/auto/qml/qqmllanguage/data/importJs.5.errors.txt
+++ b/tests/auto/qml/qqmllanguage/data/importJs.5.errors.txt
@@ -1 +1 @@
-1:1:module "com.nokia.VersionedOnlyJsModule" is not installed
+1:1:module "org.qtproject.VersionedOnlyJsModule" is not installed

diff --git a/tests/auto/qml/qqmllanguage/data/importJs.5.qml b/tests/auto/qml/qqmllanguage/data/importJs.5.qml
index a9ec20c..c0a77da 100644 (file)
--- a/tests/auto/qml/qqmllanguage/data/importJs.5.qml
+++ b/tests/auto/qml/qqmllanguage/data/importJs.5.qml
@@ -1,4 +1,4 @@
-import com.nokia.VersionedOnlyJsModule 1.0
+import org.qtproject.VersionedOnlyJsModule 1.0
 import QtQuick 2.0
 
 Item {

diff --git a/tests/auto/qml/qqmllanguage/data/importJs.6.errors.txt b/tests/auto/qml/qqmllanguage/data/importJs.6.errors.txt
index 41c9970..53b7ade 100644 (file)
--- a/tests/auto/qml/qqmllanguage/data/importJs.6.errors.txt
+++ b/tests/auto/qml/qqmllanguage/data/importJs.6.errors.txt
@@ -1 +1 @@
-2:1:"com.nokia.VersionedOnlyJsModule" is ambiguous.
+2:1:"org.qtproject.VersionedOnlyJsModule" is ambiguous.

diff --git a/tests/auto/qml/qqmllanguage/data/importJs.6.qml b/tests/auto/qml/qqmllanguage/data/importJs.6.qml
index 6c4eb89..e5f2e13 100644 (file)
--- a/tests/auto/qml/qqmllanguage/data/importJs.6.qml
+++ b/tests/auto/qml/qqmllanguage/data/importJs.6.qml
@@ -1,5 +1,5 @@
-import com.nokia.VersionedOnlyJsModule 9.0
-import com.nokia.VersionedOnlyJsModule 9.0
+import org.qtproject.VersionedOnlyJsModule 9.0
+import org.qtproject.VersionedOnlyJsModule 9.0
 import QtQuick 2.0
 
 Item {

diff --git a/tests/auto/qml/qqmllanguage/data/importJs.7.errors.txt b/tests/auto/qml/qqmllanguage/data/importJs.7.errors.txt
index 56bc4c5..8a5f3c6 100644 (file)
--- a/tests/auto/qml/qqmllanguage/data/importJs.7.errors.txt
+++ b/tests/auto/qml/qqmllanguage/data/importJs.7.errors.txt
@@ -1 +1 @@
-2:1:"com.nokia.PureJsModule" is ambiguous.
+2:1:"org.qtproject.PureJsModule" is ambiguous.

diff --git a/tests/auto/qml/qqmllanguage/data/importJs.7.qml b/tests/auto/qml/qqmllanguage/data/importJs.7.qml
index 5523a15..7b3501a 100644 (file)
--- a/tests/auto/qml/qqmllanguage/data/importJs.7.qml
+++ b/tests/auto/qml/qqmllanguage/data/importJs.7.qml
@@ -1,5 +1,5 @@
-import com.nokia.PureJsModule 1.0
-import com.nokia.PureJsModule 1.6
+import org.qtproject.PureJsModule 1.0
+import org.qtproject.PureJsModule 1.6
 import QtQuick 2.0
 
 Item {

diff --git a/tests/auto/qml/qqmllanguage/data/importJs.8.qml b/tests/auto/qml/qqmllanguage/data/importJs.8.qml
index 4ddedc3..0d5ad05 100644 (file)
--- a/tests/auto/qml/qqmllanguage/data/importJs.8.qml
+++ b/tests/auto/qml/qqmllanguage/data/importJs.8.qml
@@ -1,4 +1,4 @@
-import com.nokia.PureJsModule 1.5 as PJM
+import org.qtproject.PureJsModule 1.5 as PJM
 import QtQuick 2.0
 
 Item {

diff --git a/tests/auto/qml/qqmllanguage/data/importJs.9.qml b/tests/auto/qml/qqmllanguage/data/importJs.9.qml
index 351164b..9b6dc1e 100644 (file)
--- a/tests/auto/qml/qqmllanguage/data/importJs.9.qml
+++ b/tests/auto/qml/qqmllanguage/data/importJs.9.qml
@@ -1,5 +1,5 @@
-import com.nokia.PureJsModule 1.5 as PJM_1_5
-import com.nokia.PureJsModule 1.6 as PJM_1_6
+import org.qtproject.PureJsModule 1.5 as PJM_1_5
+import org.qtproject.PureJsModule 1.6 as PJM_1_6
 import QtQuick 2.0
 
 Item {

diff --git a/tests/auto/qml/qqmllanguage/data/importVersionMissingInstalled.errors.txt b/tests/auto/qml/qqmllanguage/data/importVersionMissingInstalled.errors.txt
index 89e58ee..59b0b87 100644 (file)
--- a/tests/auto/qml/qqmllanguage/data/importVersionMissingInstalled.errors.txt
+++ b/tests/auto/qml/qqmllanguage/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/qml/qqmllanguage/data/importVersionMissingInstalled.qml b/tests/auto/qml/qqmllanguage/data/importVersionMissingInstalled.qml
index 97ec222..6ad2a81 100644 (file)
--- a/tests/auto/qml/qqmllanguage/data/importVersionMissingInstalled.qml
+++ b/tests/auto/qml/qqmllanguage/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/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/FirstAPI.1.6.js b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/FirstAPI.1.6.js
similarity index 100%
rename from tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/FirstAPI.1.6.js
rename to tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/FirstAPI.1.6.js

diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/FirstAPI.js b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/FirstAPI.js
similarity index 100%
rename from tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/FirstAPI.js
rename to tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/FirstAPI.js

diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/SecondAPI.js b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/SecondAPI.js
similarity index 100%
rename from tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/SecondAPI.js
rename to tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/SecondAPI.js

diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/qmldir b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/qmldir
similarity index 100%
rename from tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/qmldir
rename to tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/qmldir

diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/FirstAPI.js b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule/FirstAPI.js
similarity index 100%
rename from tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/FirstAPI.js
rename to tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule/FirstAPI.js

diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/SecondAPI.js b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule/SecondAPI.js
similarity index 100%
rename from tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/SecondAPI.js
rename to tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule/SecondAPI.js

diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/qmldir b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule/qmldir
similarity index 100%
rename from tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/qmldir
rename to tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule/qmldir

diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/VersionedOnlyJsModule.9.0/SomeAPI.js b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/VersionedOnlyJsModule.9.0/SomeAPI.js
similarity index 100%
rename from tests/auto/qml/qqmllanguage/data/lib/com/nokia/VersionedOnlyJsModule.9.0/SomeAPI.js
rename to tests/auto/qml/qqmllanguage/data/lib/org/qtproject/VersionedOnlyJsModule.9.0/SomeAPI.js

diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/VersionedOnlyJsModule.9.0/qmldir b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/VersionedOnlyJsModule.9.0/qmldir
similarity index 100%
rename from tests/auto/qml/qqmllanguage/data/lib/com/nokia/VersionedOnlyJsModule.9.0/qmldir
rename to tests/auto/qml/qqmllanguage/data/lib/org/qtproject/VersionedOnlyJsModule.9.0/qmldir

diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/InstalledTest.qml b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/InstalledTest.qml
similarity index 100%
rename from tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/InstalledTest.qml
rename to tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/InstalledTest.qml

diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/InstalledTest2.qml
similarity index 100%
rename from tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml
rename to tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/InstalledTest2.qml

diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/LocalLast.qml b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/LocalLast.qml
similarity index 100%
rename from tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/LocalLast.qml
rename to tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/LocalLast.qml

diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/PrivateType.qml b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/PrivateType.qml
similarity index 100%
rename from tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/PrivateType.qml
rename to tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/PrivateType.qml

diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/qmldir b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/qmldir
similarity index 100%
rename from tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/qmldir
rename to tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/qmldir

diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest0/InstalledTest.qml
similarity index 100%
rename from tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml
rename to tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest0/InstalledTest.qml

diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest0/InstalledTest2.qml
similarity index 100%
rename from tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml
rename to tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest0/InstalledTest2.qml

diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/qmldir b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest0/qmldir
similarity index 100%
rename from tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/qmldir
rename to tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest0/qmldir

diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/Test1.qml b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest1/Test1.qml
similarity index 100%
rename from tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/Test1.qml
rename to tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest1/Test1.qml

diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/Test2.qml b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest1/Test2.qml
similarity index 100%
rename from tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/Test2.qml
rename to tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest1/Test2.qml

diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/qmldir b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest1/qmldir
similarity index 100%
rename from tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/qmldir
rename to tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest1/qmldir

diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/qmldir b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest2/qmldir
similarity index 100%
rename from tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/qmldir
rename to tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest2/qmldir

diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/test1.js b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest2/test1.js
similarity index 100%
rename from tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/test1.js
rename to tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest2/test1.js

diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/test2.js b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest2/test2.js
similarity index 100%
rename from tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/test2.js
rename to tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest2/test2.js

diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index cf6c834..6b4830f 100644 (file)
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -1977,101 +1977,101 @@ void tst_qqmllanguage::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"
         << "";
@@ -2128,10 +2128,10 @@ void tst_qqmllanguage::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_qqmllanguage::importsLocal()
@@ -2221,60 +2221,60 @@ void tst_qqmllanguage::importsInstalled_data()
 
     // import installed
     QTest::newRow("installed import 0")
-        << "import com.nokia.installedtest0 0.0\n"
+        << "import org.qtproject.installedtest0 0.0\n"
            "InstalledTestTP {}"
         << "QQuickRectangle"
         << "";
     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 {}"
         << "QQuickRectangle"
         << "";
     QTest::newRow("installed import 1")
-        << "import com.nokia.installedtest 1.0\n"
+        << "import org.qtproject.installedtest 1.0\n"
            "InstalledTest {}"
         << "QQuickRectangle"
         << "";
     QTest::newRow("installed import 2")
-        << "import com.nokia.installedtest 1.3\n"
+        << "import org.qtproject.installedtest 1.3\n"
            "InstalledTest {}"
         << "QQuickRectangle"
         << "";
     QTest::newRow("installed import 3")
-        << "import com.nokia.installedtest 1.4\n"
+        << "import org.qtproject.installedtest 1.4\n"
            "InstalledTest {}"
         << "QQuickText"
         << "";
     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";
     QTest::newRow("installed import version QML clash")
-        << "import com.nokia.installedtest1 1.0\n"
+        << "import org.qtproject.installedtest1 1.0\n"
            "Test {}"
         << ""
-        << "\"Test\" version 1.0 is defined more than once in module \"com.nokia.installedtest1\"";
+        << "\"Test\" version 1.0 is defined more than once in module \"org.qtproject.installedtest1\"";
     QTest::newRow("installed import version JS clash")
-        << "import com.nokia.installedtest2 1.0\n"
+        << "import org.qtproject.installedtest2 1.0\n"
            "Test {}"
         << ""
-        << "\"Test\" version 1.0 is defined more than once in module \"com.nokia.installedtest2\"";
+        << "\"Test\" version 1.0 is defined more than once in module \"org.qtproject.installedtest2\"";
 }
 
 void tst_qqmllanguage::importsInstalled()
@@ -2390,45 +2390,45 @@ void tst_qqmllanguage::importsOrder_data()
     QTest::addColumn<bool>("partialMatch");
 
     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()?"QQuickText":"")
-           << (!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")
            << false;
     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()?"QQuickText":"")
-           << (!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")
            << false;
     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()?"QQuickRectangle":"")
-           << (!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")
            << false;
     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()?"QQuickText":"")
-           << (!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")
            << false;
     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()?"QQuickRectangle":"")
-           << (!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")
            << false;
     QTest::newRow("installed import versus builtin 1") <<
-           "import com.nokia.installedtest 1.5\n"
+           "import org.qtproject.installedtest 1.5\n"
            "import QtQuick 2.0\n"
            "Rectangle {}"
            << (!qmlCheckTypes()?"QQuickRectangle":"")
@@ -2436,21 +2436,21 @@ void tst_qqmllanguage::importsOrder_data()
            << true;
     QTest::newRow("installed import versus builtin 2") <<
            "import QtQuick 2.0\n"
-           "import com.nokia.installedtest 1.5\n"
+           "import org.qtproject.installedtest 1.5\n"
            "Rectangle {}"
            << (!qmlCheckTypes()?"QQuickText":"")
-           << (!qmlCheckTypes()?"":"Rectangle is ambiguous. Found in lib/com/nokia/installedtest/ and in file://")
+           << (!qmlCheckTypes()?"":"Rectangle is ambiguous. Found in lib/org/qtproject/installedtest/ and in file://")
            << true;
     QTest::newRow("namespaces cannot be overridden by types 1") <<
            "import QtQuick 2.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"
            << false;
     QTest::newRow("namespaces cannot be overridden by types 2") <<
            "import QtQuick 2.0 as Rectangle\n"
-           "import com.nokia.installedtest 1.5\n"
+           "import org.qtproject.installedtest 1.5\n"
            "Rectangle.Image {}"
            << "QQuickImage"
            << ""
@@ -2461,10 +2461,10 @@ void tst_qqmllanguage::importsOrder_data()
            << ""
            << false;
     QTest::newRow("local last 2") <<
-           "import com.nokia.installedtest 1.0\n"
+           "import org.qtproject.installedtest 1.0\n"
            "LocalLast {}"
-           << (!qmlCheckTypes()?"QQuickRectangle":"")// i.e. from com.nokia.installedtest, not data/LocalLast.qml
-           << (!qmlCheckTypes()?"":"LocalLast is ambiguous. Found in lib/com/nokia/installedtest/ and in ")
+           << (!qmlCheckTypes()?"QQuickRectangle":"")// i.e. from org.qtproject.installedtest, not data/LocalLast.qml
+           << (!qmlCheckTypes()?"":"LocalLast is ambiguous. Found in lib/org/qtproject/installedtest/ and in ")
            << false;
 }
 
@@ -2773,17 +2773,17 @@ void tst_qqmllanguage::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