diff options
Diffstat (limited to 'tests/auto/qml/qqmllanguage/data')
38 files changed, 19 insertions, 19 deletions
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/org/qtproject/PureJsModule.1.6/FirstAPI.1.6.js index c7b3c8b6ca..c7b3c8b6ca 100644 --- 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 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 index b90033eeb4..b90033eeb4 100644 --- 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 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 index b802477cb6..b802477cb6 100644 --- 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 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 index 083afb051c..083afb051c 100644 --- 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 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 index b90033eeb4..b90033eeb4 100644 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/FirstAPI.js +++ b/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 index b802477cb6..b802477cb6 100644 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/SecondAPI.js +++ b/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 index 5c3acebd39..5c3acebd39 100644 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/PureJsModule/qmldir +++ b/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 index efac613fc2..efac613fc2 100644 --- 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 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 index 5c1b182028..5c1b182028 100644 --- 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 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 index 56daa9c09a..56daa9c09a 100644 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/InstalledTest.qml +++ b/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 index 59df88216e..59df88216e 100644 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml +++ b/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 index 26a5d6bba9..26a5d6bba9 100644 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/LocalLast.qml +++ b/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 index ed1b09e419..ed1b09e419 100644 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/PrivateType.qml +++ b/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 index d15720a154..d15720a154 100644 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest/qmldir +++ b/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 index 56daa9c09a..56daa9c09a 100644 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml +++ b/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 index 59df88216e..59df88216e 100644 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml +++ b/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 index b301226099..b301226099 100644 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest0/qmldir +++ b/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 index 617bdaaf67..617bdaaf67 100644 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/Test1.qml +++ b/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 index 617bdaaf67..617bdaaf67 100644 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/Test2.qml +++ b/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 index 90ad9fdb19..90ad9fdb19 100644 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest1/qmldir +++ b/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 index c492dec4d7..c492dec4d7 100644 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/qmldir +++ b/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 index 6a53b53b02..6a53b53b02 100644 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/test1.js +++ b/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 index 34d5cdda65..34d5cdda65 100644 --- a/tests/auto/qml/qqmllanguage/data/lib/com/nokia/installedtest2/test2.js +++ b/tests/auto/qml/qqmllanguage/data/lib/org/qtproject/installedtest2/test2.js |