From 9be1b6ba487f6a7547901852fc439610eb3338c7 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Fri, 30 Nov 2012 15:16:27 -0800 Subject: Remove 'com.nokia' string from autotest Change-Id: Ic318dbe7a48412e9689ca0f4506c7098d9f48b5e Reviewed-by: Christopher Adams --- tests/auto/qml/qqmllanguage/data/importJs.1.qml | 2 +- tests/auto/qml/qqmllanguage/data/importJs.10.qml | 4 +- tests/auto/qml/qqmllanguage/data/importJs.2.qml | 2 +- tests/auto/qml/qqmllanguage/data/importJs.3.qml | 2 +- tests/auto/qml/qqmllanguage/data/importJs.4.qml | 2 +- .../qml/qqmllanguage/data/importJs.5.errors.txt | 2 +- tests/auto/qml/qqmllanguage/data/importJs.5.qml | 2 +- .../qml/qqmllanguage/data/importJs.6.errors.txt | 2 +- tests/auto/qml/qqmllanguage/data/importJs.6.qml | 4 +- .../qml/qqmllanguage/data/importJs.7.errors.txt | 2 +- tests/auto/qml/qqmllanguage/data/importJs.7.qml | 4 +- tests/auto/qml/qqmllanguage/data/importJs.8.qml | 2 +- tests/auto/qml/qqmllanguage/data/importJs.9.qml | 4 +- .../data/importVersionMissingInstalled.errors.txt | 2 +- .../data/importVersionMissingInstalled.qml | 2 +- .../lib/com/nokia/PureJsModule.1.6/FirstAPI.1.6.js | 5 - .../lib/com/nokia/PureJsModule.1.6/FirstAPI.js | 5 - .../lib/com/nokia/PureJsModule.1.6/SecondAPI.js | 5 - .../data/lib/com/nokia/PureJsModule.1.6/qmldir | 3 - .../data/lib/com/nokia/PureJsModule/FirstAPI.js | 5 - .../data/lib/com/nokia/PureJsModule/SecondAPI.js | 5 - .../data/lib/com/nokia/PureJsModule/qmldir | 2 - .../com/nokia/VersionedOnlyJsModule.9.0/SomeAPI.js | 5 - .../lib/com/nokia/VersionedOnlyJsModule.9.0/qmldir | 1 - .../lib/com/nokia/installedtest/InstalledTest.qml | 2 - .../lib/com/nokia/installedtest/InstalledTest2.qml | 2 - .../data/lib/com/nokia/installedtest/LocalLast.qml | 2 - .../lib/com/nokia/installedtest/PrivateType.qml | 2 - .../data/lib/com/nokia/installedtest/qmldir | 4 - .../lib/com/nokia/installedtest0/InstalledTest.qml | 2 - .../com/nokia/installedtest0/InstalledTest2.qml | 2 - .../data/lib/com/nokia/installedtest0/qmldir | 2 - .../data/lib/com/nokia/installedtest1/Test1.qml | 3 - .../data/lib/com/nokia/installedtest1/Test2.qml | 3 - .../data/lib/com/nokia/installedtest1/qmldir | 2 - .../data/lib/com/nokia/installedtest2/qmldir | 2 - .../data/lib/com/nokia/installedtest2/test1.js | 1 - .../data/lib/com/nokia/installedtest2/test2.js | 1 - .../org/qtproject/PureJsModule.1.6/FirstAPI.1.6.js | 5 + .../lib/org/qtproject/PureJsModule.1.6/FirstAPI.js | 5 + .../org/qtproject/PureJsModule.1.6/SecondAPI.js | 5 + .../data/lib/org/qtproject/PureJsModule.1.6/qmldir | 3 + .../lib/org/qtproject/PureJsModule/FirstAPI.js | 5 + .../lib/org/qtproject/PureJsModule/SecondAPI.js | 5 + .../data/lib/org/qtproject/PureJsModule/qmldir | 2 + .../qtproject/VersionedOnlyJsModule.9.0/SomeAPI.js | 5 + .../org/qtproject/VersionedOnlyJsModule.9.0/qmldir | 1 + .../org/qtproject/installedtest/InstalledTest.qml | 2 + .../org/qtproject/installedtest/InstalledTest2.qml | 2 + .../lib/org/qtproject/installedtest/LocalLast.qml | 2 + .../org/qtproject/installedtest/PrivateType.qml | 2 + .../data/lib/org/qtproject/installedtest/qmldir | 4 + .../org/qtproject/installedtest0/InstalledTest.qml | 2 + .../qtproject/installedtest0/InstalledTest2.qml | 2 + .../data/lib/org/qtproject/installedtest0/qmldir | 2 + .../lib/org/qtproject/installedtest1/Test1.qml | 3 + .../lib/org/qtproject/installedtest1/Test2.qml | 3 + .../data/lib/org/qtproject/installedtest1/qmldir | 2 + .../data/lib/org/qtproject/installedtest2/qmldir | 2 + .../data/lib/org/qtproject/installedtest2/test1.js | 1 + .../data/lib/org/qtproject/installedtest2/test2.js | 1 + tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp | 156 ++++++++++----------- 62 files changed, 163 insertions(+), 163 deletions(-) delete mode 100644 tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/FirstAPI.1.6.js delete mode 100644 tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/FirstAPI.js delete mode 100644 tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/SecondAPI.js delete mode 100644 tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/qmldir delete mode 100644 tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/FirstAPI.js delete mode 100644 tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/SecondAPI.js delete mode 100644 tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/qmldir delete mode 100644 tests/auto/qml/qqmllanguage/data/lib/com/nokia/VersionedOnlyJsModule.9.0/SomeAPI.js delete mode 100644 tests/auto/qml/qqmllanguage/data/lib/com/nokia/VersionedOnlyJsModule.9.0/qmldir delete mode 100644 tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/InstalledTest.qml delete mode 100644 tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml delete mode 100644 tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/LocalLast.qml delete mode 100644 tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/PrivateType.qml delete mode 100644 tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/qmldir delete mode 100644 tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml delete mode 100644 tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml delete mode 100644 tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/qmldir delete mode 100644 tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/Test1.qml delete mode 100644 tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/Test2.qml delete mode 100644 tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/qmldir delete mode 100644 tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/qmldir delete mode 100644 tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/test1.js delete mode 100644 tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/test2.js create mode 100644 tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/FirstAPI.1.6.js create mode 100644 tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/FirstAPI.js create mode 100644 tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/SecondAPI.js create mode 100644 tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/qmldir create mode 100644 tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule/FirstAPI.js create mode 100644 tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule/SecondAPI.js create mode 100644 tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule/qmldir create mode 100644 tests/auto/qml/qqmllanguage/data/lib/org/qtproject/VersionedOnlyJsModule.9.0/SomeAPI.js create mode 100644 tests/auto/qml/qqmllanguage/data/lib/org/qtproject/VersionedOnlyJsModule.9.0/qmldir create mode 100644 tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/InstalledTest.qml create mode 100644 tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/InstalledTest2.qml create mode 100644 tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/LocalLast.qml create mode 100644 tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/PrivateType.qml create mode 100644 tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/qmldir create mode 100644 tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest0/InstalledTest.qml create mode 100644 tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest0/InstalledTest2.qml create mode 100644 tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest0/qmldir create mode 100644 tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest1/Test1.qml create mode 100644 tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest1/Test2.qml create mode 100644 tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest1/qmldir create mode 100644 tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest2/qmldir create mode 100644 tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest2/test1.js create mode 100644 tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest2/test2.js diff --git a/tests/auto/qml/qqmllanguage/data/importJs.1.qml b/tests/auto/qml/qqmllanguage/data/importJs.1.qml index eaba98ecd2..89344c02cc 100644 --- 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 578ca47ea5..c0bb730ac7 100644 --- 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 dd3d65c5dd..5a0659fb26 100644 --- 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 f59d445a56..e241d610ae 100644 --- 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 e7b74bac0a..d323cfab3b 100644 --- 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 10dbc80297..7f8648bace 100644 --- 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 a9ec20c72b..c0a77dada2 100644 --- 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 41c99702a2..53b7ade8bf 100644 --- 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 6c4eb89551..e5f2e13f10 100644 --- 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 56bc4c548f..8a5f3c6721 100644 --- 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 5523a158bd..7b3501ad8f 100644 --- 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 4ddedc31a8..0d5ad052e7 100644 --- 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 351164ba41..9b6dc1e073 100644 --- 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 89e58ee764..59b0b87477 100644 --- 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 97ec22280f..6ad2a812e9 100644 --- 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/com/nokia/PureJsModule.1.6/FirstAPI.1.6.js deleted file mode 100644 index c7b3c8b6ca..0000000000 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/FirstAPI.1.6.js +++ /dev/null @@ -1,5 +0,0 @@ -var major = 1 -var minor = 6 - -function greeting() { return "Good news, everybody!" } - diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/FirstAPI.js b/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/FirstAPI.js deleted file mode 100644 index b90033eeb4..0000000000 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/FirstAPI.js +++ /dev/null @@ -1,5 +0,0 @@ -var major = 1 -var minor = 0 - -function greeting() { return "Hello" } - diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/SecondAPI.js b/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/SecondAPI.js deleted file mode 100644 index b802477cb6..0000000000 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/SecondAPI.js +++ /dev/null @@ -1,5 +0,0 @@ -var major = 1 -var minor = 5 - -function greeting() { return "Howdy" } - diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/qmldir b/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/qmldir deleted file mode 100644 index 083afb051c..0000000000 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule.1.6/qmldir +++ /dev/null @@ -1,3 +0,0 @@ -FirstAPI 1.0 FirstAPI.js -FirstAPI 1.6 FirstAPI.1.6.js -SecondAPI 1.5 SecondAPI.js diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/FirstAPI.js b/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/FirstAPI.js deleted file mode 100644 index b90033eeb4..0000000000 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/FirstAPI.js +++ /dev/null @@ -1,5 +0,0 @@ -var major = 1 -var minor = 0 - -function greeting() { return "Hello" } - diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/SecondAPI.js b/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/SecondAPI.js deleted file mode 100644 index b802477cb6..0000000000 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/SecondAPI.js +++ /dev/null @@ -1,5 +0,0 @@ -var major = 1 -var minor = 5 - -function greeting() { return "Howdy" } - diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/qmldir b/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/qmldir deleted file mode 100644 index 5c3acebd39..0000000000 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/qmldir +++ /dev/null @@ -1,2 +0,0 @@ -FirstAPI 1.0 FirstAPI.js -SecondAPI 1.5 SecondAPI.js diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/VersionedOnlyJsModule.9.0/SomeAPI.js b/tests/auto/qml/qqmllanguage/data/lib/com/nokia/VersionedOnlyJsModule.9.0/SomeAPI.js deleted file mode 100644 index efac613fc2..0000000000 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/VersionedOnlyJsModule.9.0/SomeAPI.js +++ /dev/null @@ -1,5 +0,0 @@ -var major = 9 -var minor = 0 - -function greeting() { return "Hey hey hey" } - diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/VersionedOnlyJsModule.9.0/qmldir b/tests/auto/qml/qqmllanguage/data/lib/com/nokia/VersionedOnlyJsModule.9.0/qmldir deleted file mode 100644 index 5c1b182028..0000000000 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/VersionedOnlyJsModule.9.0/qmldir +++ /dev/null @@ -1 +0,0 @@ -SomeAPI 9.0 SomeAPI.js diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/InstalledTest.qml b/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/InstalledTest.qml deleted file mode 100644 index 56daa9c09a..0000000000 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/InstalledTest.qml +++ /dev/null @@ -1,2 +0,0 @@ -import QtQuick 2.0 as Qt47 -Qt47.Rectangle {} diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml b/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml deleted file mode 100644 index 59df88216e..0000000000 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml +++ /dev/null @@ -1,2 +0,0 @@ -import QtQuick 2.0 -Text {} diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/LocalLast.qml b/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/LocalLast.qml deleted file mode 100644 index 26a5d6bba9..0000000000 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/LocalLast.qml +++ /dev/null @@ -1,2 +0,0 @@ -import QtQuick 2.0 -Rectangle {} diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/PrivateType.qml b/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/PrivateType.qml deleted file mode 100644 index ed1b09e419..0000000000 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/PrivateType.qml +++ /dev/null @@ -1,2 +0,0 @@ -import QtQuick 2.0 -Image {} diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/qmldir b/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/qmldir deleted file mode 100644 index d15720a154..0000000000 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/qmldir +++ /dev/null @@ -1,4 +0,0 @@ -Rectangle 1.5 InstalledTest2.qml -LocalLast 1.0 LocalLast.qml -InstalledTest 1.4 InstalledTest2.qml -InstalledTest 1.0 InstalledTest.qml diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml b/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml deleted file mode 100644 index 56daa9c09a..0000000000 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml +++ /dev/null @@ -1,2 +0,0 @@ -import QtQuick 2.0 as Qt47 -Qt47.Rectangle {} diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml b/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml deleted file mode 100644 index 59df88216e..0000000000 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml +++ /dev/null @@ -1,2 +0,0 @@ -import QtQuick 2.0 -Text {} diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/qmldir b/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/qmldir deleted file mode 100644 index b301226099..0000000000 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/qmldir +++ /dev/null @@ -1,2 +0,0 @@ -InstalledTest 1.4 InstalledTest2.qml -InstalledTestTP 0.0 InstalledTest.qml diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/Test1.qml b/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/Test1.qml deleted file mode 100644 index 617bdaaf67..0000000000 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/Test1.qml +++ /dev/null @@ -1,3 +0,0 @@ -import QtQuick 2.0 - -Item {} diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/Test2.qml b/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/Test2.qml deleted file mode 100644 index 617bdaaf67..0000000000 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/Test2.qml +++ /dev/null @@ -1,3 +0,0 @@ -import QtQuick 2.0 - -Item {} diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/qmldir b/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/qmldir deleted file mode 100644 index 90ad9fdb19..0000000000 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/qmldir +++ /dev/null @@ -1,2 +0,0 @@ -Test 1.0 Test1.qml -Test 1.0 Test2.qml diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/qmldir b/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/qmldir deleted file mode 100644 index c492dec4d7..0000000000 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/qmldir +++ /dev/null @@ -1,2 +0,0 @@ -Test 1.0 test1.js -Test 1.0 test2.js diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/test1.js b/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/test1.js deleted file mode 100644 index 6a53b53b02..0000000000 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/test1.js +++ /dev/null @@ -1 +0,0 @@ -var foo = 1 diff --git a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/test2.js b/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/test2.js deleted file mode 100644 index 34d5cdda65..0000000000 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/test2.js +++ /dev/null @@ -1 +0,0 @@ -var bar = 2 diff --git a/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/FirstAPI.1.6.js b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/FirstAPI.1.6.js new file mode 100644 index 0000000000..c7b3c8b6ca --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/FirstAPI.1.6.js @@ -0,0 +1,5 @@ +var major = 1 +var minor = 6 + +function greeting() { return "Good news, everybody!" } + diff --git a/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/FirstAPI.js b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/FirstAPI.js new file mode 100644 index 0000000000..b90033eeb4 --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/FirstAPI.js @@ -0,0 +1,5 @@ +var major = 1 +var minor = 0 + +function greeting() { return "Hello" } + diff --git a/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/SecondAPI.js b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/SecondAPI.js new file mode 100644 index 0000000000..b802477cb6 --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/SecondAPI.js @@ -0,0 +1,5 @@ +var major = 1 +var minor = 5 + +function greeting() { return "Howdy" } + diff --git a/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/qmldir b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/qmldir new file mode 100644 index 0000000000..083afb051c --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule.1.6/qmldir @@ -0,0 +1,3 @@ +FirstAPI 1.0 FirstAPI.js +FirstAPI 1.6 FirstAPI.1.6.js +SecondAPI 1.5 SecondAPI.js diff --git a/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule/FirstAPI.js b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule/FirstAPI.js new file mode 100644 index 0000000000..b90033eeb4 --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule/FirstAPI.js @@ -0,0 +1,5 @@ +var major = 1 +var minor = 0 + +function greeting() { return "Hello" } + diff --git a/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule/SecondAPI.js b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule/SecondAPI.js new file mode 100644 index 0000000000..b802477cb6 --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule/SecondAPI.js @@ -0,0 +1,5 @@ +var major = 1 +var minor = 5 + +function greeting() { return "Howdy" } + diff --git a/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule/qmldir b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule/qmldir new file mode 100644 index 0000000000..5c3acebd39 --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/PureJsModule/qmldir @@ -0,0 +1,2 @@ +FirstAPI 1.0 FirstAPI.js +SecondAPI 1.5 SecondAPI.js diff --git a/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/VersionedOnlyJsModule.9.0/SomeAPI.js b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/VersionedOnlyJsModule.9.0/SomeAPI.js new file mode 100644 index 0000000000..efac613fc2 --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/VersionedOnlyJsModule.9.0/SomeAPI.js @@ -0,0 +1,5 @@ +var major = 9 +var minor = 0 + +function greeting() { return "Hey hey hey" } + diff --git a/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/VersionedOnlyJsModule.9.0/qmldir b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/VersionedOnlyJsModule.9.0/qmldir new file mode 100644 index 0000000000..5c1b182028 --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/VersionedOnlyJsModule.9.0/qmldir @@ -0,0 +1 @@ +SomeAPI 9.0 SomeAPI.js diff --git a/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/InstalledTest.qml b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/InstalledTest.qml new file mode 100644 index 0000000000..56daa9c09a --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/InstalledTest.qml @@ -0,0 +1,2 @@ +import QtQuick 2.0 as Qt47 +Qt47.Rectangle {} diff --git a/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/InstalledTest2.qml b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/InstalledTest2.qml new file mode 100644 index 0000000000..59df88216e --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/InstalledTest2.qml @@ -0,0 +1,2 @@ +import QtQuick 2.0 +Text {} diff --git a/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/LocalLast.qml b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/LocalLast.qml new file mode 100644 index 0000000000..26a5d6bba9 --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/LocalLast.qml @@ -0,0 +1,2 @@ +import QtQuick 2.0 +Rectangle {} diff --git a/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/PrivateType.qml b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/PrivateType.qml new file mode 100644 index 0000000000..ed1b09e419 --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/PrivateType.qml @@ -0,0 +1,2 @@ +import QtQuick 2.0 +Image {} diff --git a/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/qmldir b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/qmldir new file mode 100644 index 0000000000..d15720a154 --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest/qmldir @@ -0,0 +1,4 @@ +Rectangle 1.5 InstalledTest2.qml +LocalLast 1.0 LocalLast.qml +InstalledTest 1.4 InstalledTest2.qml +InstalledTest 1.0 InstalledTest.qml diff --git a/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest0/InstalledTest.qml b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest0/InstalledTest.qml new file mode 100644 index 0000000000..56daa9c09a --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest0/InstalledTest.qml @@ -0,0 +1,2 @@ +import QtQuick 2.0 as Qt47 +Qt47.Rectangle {} diff --git a/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest0/InstalledTest2.qml b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest0/InstalledTest2.qml new file mode 100644 index 0000000000..59df88216e --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest0/InstalledTest2.qml @@ -0,0 +1,2 @@ +import QtQuick 2.0 +Text {} diff --git a/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest0/qmldir b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest0/qmldir new file mode 100644 index 0000000000..b301226099 --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest0/qmldir @@ -0,0 +1,2 @@ +InstalledTest 1.4 InstalledTest2.qml +InstalledTestTP 0.0 InstalledTest.qml diff --git a/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest1/Test1.qml b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest1/Test1.qml new file mode 100644 index 0000000000..617bdaaf67 --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest1/Test1.qml @@ -0,0 +1,3 @@ +import QtQuick 2.0 + +Item {} diff --git a/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest1/Test2.qml b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest1/Test2.qml new file mode 100644 index 0000000000..617bdaaf67 --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest1/Test2.qml @@ -0,0 +1,3 @@ +import QtQuick 2.0 + +Item {} diff --git a/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest1/qmldir b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest1/qmldir new file mode 100644 index 0000000000..90ad9fdb19 --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest1/qmldir @@ -0,0 +1,2 @@ +Test 1.0 Test1.qml +Test 1.0 Test2.qml diff --git a/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest2/qmldir b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest2/qmldir new file mode 100644 index 0000000000..c492dec4d7 --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest2/qmldir @@ -0,0 +1,2 @@ +Test 1.0 test1.js +Test 1.0 test2.js diff --git a/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest2/test1.js b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest2/test1.js new file mode 100644 index 0000000000..6a53b53b02 --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest2/test1.js @@ -0,0 +1 @@ +var foo = 1 diff --git a/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest2/test2.js b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest2/test2.js new file mode 100644 index 0000000000..34d5cdda65 --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest2/test2.js @@ -0,0 +1 @@ +var bar = 2 diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp index cf6c83444e..6b4830f11d 100644 --- 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("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("com.nokia.TestPre", 1, 0, "Test"); + qmlRegisterType("org.qtproject.TestPre", 1, 0, "Test"); - qmlRegisterType("com.nokia.Test", 0, 0, "TestTP"); - qmlRegisterType("com.nokia.Test", 1, 0, "Test"); - qmlRegisterType("com.nokia.Test", 1, 5, "Test"); - qmlRegisterType("com.nokia.Test", 1, 8, "Test"); - qmlRegisterType("com.nokia.Test", 1, 9, "OldTest"); - qmlRegisterType("com.nokia.Test", 1, 12, "Test"); + qmlRegisterType("org.qtproject.Test", 0, 0, "TestTP"); + qmlRegisterType("org.qtproject.Test", 1, 0, "Test"); + qmlRegisterType("org.qtproject.Test", 1, 5, "Test"); + qmlRegisterType("org.qtproject.Test", 1, 8, "Test"); + qmlRegisterType("org.qtproject.Test", 1, 9, "OldTest"); + qmlRegisterType("org.qtproject.Test", 1, 12, "Test"); // Registering the TestType class in other modules should have no adverse effects - qmlRegisterType("com.nokia.TestPost", 1, 0, "Test"); + qmlRegisterType("org.qtproject.TestPost", 1, 0, "Test"); // Create locale-specific file // For POSIX, this will just be data/I18nType.qml, since POSIX is 7-bit -- cgit v1.2.3