diff options
author | Liang Qi <liang.qi@digia.com> | 2013-10-31 09:20:35 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-31 20:16:11 +0100 |
commit | 7d850df7e68e0eab0f07d5f7a03050175080fb81 (patch) | |
tree | d86a38860d9d21abfa5a57dbca04f16d485b1f68 | |
parent | 02a8fc62491fbdee1913c2c20c939308e05f8d6f (diff) |
tests: replace nokia with qtproject in tst_qqmlmoduleplugin
Change-Id: I674da7f77dde380fb0772d5077da84de875b6ce8
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
57 files changed, 86 insertions, 86 deletions
diff --git a/tests/auto/qml/qqmlmoduleplugin/.gitignore b/tests/auto/qml/qqmlmoduleplugin/.gitignore index b458285566..040a48c25f 100644 --- a/tests/auto/qml/qqmlmoduleplugin/.gitignore +++ b/tests/auto/qml/qqmlmoduleplugin/.gitignore @@ -1,2 +1,2 @@ imports/*/*/* -!imports/com/nokia/PureQmlModule/* +!imports/org/qtproject/PureQmlModule/* diff --git a/tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.2.qml b/tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.2.qml index a0ac0c72c7..97732d35d8 100644 --- a/tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.2.qml +++ b/tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.2.qml @@ -1,4 +1,4 @@ -import com.nokia.AutoTestQmlMixedPluginType 1.5 +import org.qtproject.AutoTestQmlMixedPluginType 1.5 import QtQuick 2.0 Item { diff --git a/tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.qml b/tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.qml index 1346cbdb7b..f09c29b5a8 100644 --- a/tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.qml +++ b/tests/auto/qml/qqmlmoduleplugin/data/importsMixedQmlCppPlugin.qml @@ -1,4 +1,4 @@ -import com.nokia.AutoTestQmlMixedPluginType 1.0 +import org.qtproject.AutoTestQmlMixedPluginType 1.0 import QtQuick 2.0 Item { diff --git a/tests/auto/qml/qqmlmoduleplugin/data/importsNested.1.errors.txt b/tests/auto/qml/qqmlmoduleplugin/data/importsNested.1.errors.txt index 262193788b..de75f47c03 100644 --- a/tests/auto/qml/qqmlmoduleplugin/data/importsNested.1.errors.txt +++ b/tests/auto/qml/qqmlmoduleplugin/data/importsNested.1.errors.txt @@ -1 +1 @@ -1:1:module "com.nokia.AutoTestQmlNestedPluginType.Nested" is not installed +1:1:module "org.qtproject.AutoTestQmlNestedPluginType.Nested" is not installed diff --git a/tests/auto/qml/qqmlmoduleplugin/data/importsNested.1.qml b/tests/auto/qml/qqmlmoduleplugin/data/importsNested.1.qml index b3f9ac6c3f..35fff29a69 100644 --- a/tests/auto/qml/qqmlmoduleplugin/data/importsNested.1.qml +++ b/tests/auto/qml/qqmlmoduleplugin/data/importsNested.1.qml @@ -1,5 +1,5 @@ -import com.nokia.AutoTestQmlNestedPluginType.Nested 1.0 -import com.nokia.AutoTestQmlNestedPluginType 1.0 +import org.qtproject.AutoTestQmlNestedPluginType.Nested 1.0 +import org.qtproject.AutoTestQmlNestedPluginType 1.0 MyNestedPluginType { } diff --git a/tests/auto/qml/qqmlmoduleplugin/data/importsNested.2.qml b/tests/auto/qml/qqmlmoduleplugin/data/importsNested.2.qml index cb8e0e33d1..ed4ddf2a1a 100644 --- a/tests/auto/qml/qqmlmoduleplugin/data/importsNested.2.qml +++ b/tests/auto/qml/qqmlmoduleplugin/data/importsNested.2.qml @@ -1,5 +1,5 @@ -import com.nokia.AutoTestQmlNestedPluginType 1.0 -import com.nokia.AutoTestQmlNestedPluginType.Nested 1.0 +import org.qtproject.AutoTestQmlNestedPluginType 1.0 +import org.qtproject.AutoTestQmlNestedPluginType.Nested 1.0 MyNestedPluginType { } diff --git a/tests/auto/qml/qqmlmoduleplugin/data/importsNested.3.qml b/tests/auto/qml/qqmlmoduleplugin/data/importsNested.3.qml index 69c6a34f46..b3dbf1741e 100644 --- a/tests/auto/qml/qqmlmoduleplugin/data/importsNested.3.qml +++ b/tests/auto/qml/qqmlmoduleplugin/data/importsNested.3.qml @@ -1,4 +1,4 @@ -import com.nokia.AutoTestQmlNestedPluginType 1.0 +import org.qtproject.AutoTestQmlNestedPluginType 1.0 MyNestedPluginType { } diff --git a/tests/auto/qml/qqmlmoduleplugin/data/importsNested.4.errors.txt b/tests/auto/qml/qqmlmoduleplugin/data/importsNested.4.errors.txt index 9743ae4f68..0e92fce154 100644 --- a/tests/auto/qml/qqmlmoduleplugin/data/importsNested.4.errors.txt +++ b/tests/auto/qml/qqmlmoduleplugin/data/importsNested.4.errors.txt @@ -1 +1 @@ -2:1:module "com.nokia.AutoTestQmlNestedPluginType.Nested" version 6.66 is not installed +2:1:module "org.qtproject.AutoTestQmlNestedPluginType.Nested" version 6.66 is not installed diff --git a/tests/auto/qml/qqmlmoduleplugin/data/importsNested.4.qml b/tests/auto/qml/qqmlmoduleplugin/data/importsNested.4.qml index dce8b7564a..32a4385fbf 100644 --- a/tests/auto/qml/qqmlmoduleplugin/data/importsNested.4.qml +++ b/tests/auto/qml/qqmlmoduleplugin/data/importsNested.4.qml @@ -1,5 +1,5 @@ -import com.nokia.AutoTestQmlNestedPluginType 1.0 -import com.nokia.AutoTestQmlNestedPluginType.Nested 6.66 +import org.qtproject.AutoTestQmlNestedPluginType 1.0 +import org.qtproject.AutoTestQmlNestedPluginType.Nested 6.66 MyNestedPluginType { } diff --git a/tests/auto/qml/qqmlmoduleplugin/data/incorrectCase.qml b/tests/auto/qml/qqmlmoduleplugin/data/incorrectCase.qml index a21ece7058..86504269fa 100644 --- a/tests/auto/qml/qqmlmoduleplugin/data/incorrectCase.qml +++ b/tests/auto/qml/qqmlmoduleplugin/data/incorrectCase.qml @@ -1,4 +1,4 @@ -import com.nokia.WrongCase 1.0 +import org.qtproject.WrongCase 1.0 MyPluginType { value: 123 } diff --git a/tests/auto/qml/qqmlmoduleplugin/data/pluginWithQmlFile.qml b/tests/auto/qml/qqmlmoduleplugin/data/pluginWithQmlFile.qml index a9e28e5d8b..237c49d8eb 100644 --- a/tests/auto/qml/qqmlmoduleplugin/data/pluginWithQmlFile.qml +++ b/tests/auto/qml/qqmlmoduleplugin/data/pluginWithQmlFile.qml @@ -1,3 +1,3 @@ -import com.nokia.AutoTestPluginWithQmlFile 1.0 +import org.qtproject.AutoTestPluginWithQmlFile 1.0 MyQmlFile {} diff --git a/tests/auto/qml/qqmlmoduleplugin/data/versionNotInstalled.2.errors.txt b/tests/auto/qml/qqmlmoduleplugin/data/versionNotInstalled.2.errors.txt index a40c1c8211..8790d4e545 100644 --- a/tests/auto/qml/qqmlmoduleplugin/data/versionNotInstalled.2.errors.txt +++ b/tests/auto/qml/qqmlmoduleplugin/data/versionNotInstalled.2.errors.txt @@ -1 +1 @@ -1:1:module "com.nokia.AutoTestQmlVersionPluginType" version 1.9 is not installed +1:1:module "org.qtproject.AutoTestQmlVersionPluginType" version 1.9 is not installed diff --git a/tests/auto/qml/qqmlmoduleplugin/data/versionNotInstalled.2.qml b/tests/auto/qml/qqmlmoduleplugin/data/versionNotInstalled.2.qml index bda59f0a32..28351cf7f9 100644 --- a/tests/auto/qml/qqmlmoduleplugin/data/versionNotInstalled.2.qml +++ b/tests/auto/qml/qqmlmoduleplugin/data/versionNotInstalled.2.qml @@ -1,4 +1,4 @@ -import com.nokia.AutoTestQmlVersionPluginType 1.9 +import org.qtproject.AutoTestQmlVersionPluginType 1.9 import QtQuick 2.0 QtObject { diff --git a/tests/auto/qml/qqmlmoduleplugin/data/versionNotInstalled.errors.txt b/tests/auto/qml/qqmlmoduleplugin/data/versionNotInstalled.errors.txt index 2634223de7..f6b502e99c 100644 --- a/tests/auto/qml/qqmlmoduleplugin/data/versionNotInstalled.errors.txt +++ b/tests/auto/qml/qqmlmoduleplugin/data/versionNotInstalled.errors.txt @@ -1 +1 @@ -1:1:module "com.nokia.AutoTestQmlVersionPluginType" version 1.1 is not installed +1:1:module "org.qtproject.AutoTestQmlVersionPluginType" version 1.1 is not installed diff --git a/tests/auto/qml/qqmlmoduleplugin/data/versionNotInstalled.qml b/tests/auto/qml/qqmlmoduleplugin/data/versionNotInstalled.qml index 2e556e76d6..9f599c5c15 100644 --- a/tests/auto/qml/qqmlmoduleplugin/data/versionNotInstalled.qml +++ b/tests/auto/qml/qqmlmoduleplugin/data/versionNotInstalled.qml @@ -1,4 +1,4 @@ -import com.nokia.AutoTestQmlVersionPluginType 1.1 +import org.qtproject.AutoTestQmlVersionPluginType 1.1 import QtQuick 2.0 QtObject { diff --git a/tests/auto/qml/qqmlmoduleplugin/data/works.qml b/tests/auto/qml/qqmlmoduleplugin/data/works.qml index f29ae24ea2..58f5212b90 100644 --- a/tests/auto/qml/qqmlmoduleplugin/data/works.qml +++ b/tests/auto/qml/qqmlmoduleplugin/data/works.qml @@ -1,3 +1,3 @@ -import com.nokia.AutoTestQmlPluginType 1.0 +import org.qtproject.AutoTestQmlPluginType 1.0 MyPluginType { value: 123 } diff --git a/tests/auto/qml/qqmlmoduleplugin/data/works2.qml b/tests/auto/qml/qqmlmoduleplugin/data/works2.qml index cc322bf26b..c3a21e0d16 100644 --- a/tests/auto/qml/qqmlmoduleplugin/data/works2.qml +++ b/tests/auto/qml/qqmlmoduleplugin/data/works2.qml @@ -1,3 +1,3 @@ -import com.nokia.AutoTestQmlPluginType 2.0 +import org.qtproject.AutoTestQmlPluginType 2.0 MyPluginType { valueOnlyIn2: 123 } diff --git a/tests/auto/qml/qqmlmoduleplugin/data/works21.qml b/tests/auto/qml/qqmlmoduleplugin/data/works21.qml index c08160ac5a..939cea8bc7 100644 --- a/tests/auto/qml/qqmlmoduleplugin/data/works21.qml +++ b/tests/auto/qml/qqmlmoduleplugin/data/works21.qml @@ -1,3 +1,3 @@ -import com.nokia.AutoTestQmlPluginType 2.1 +import org.qtproject.AutoTestQmlPluginType 2.1 MyPluginType { valueOnlyIn2: 123 } diff --git a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/PureQmlModule/ComponentA.qml b/tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/PureQmlModule/ComponentA.qml index 617bdaaf67..617bdaaf67 100644 --- a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/PureQmlModule/ComponentA.qml +++ b/tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/PureQmlModule/ComponentA.qml diff --git a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/PureQmlModule/ComponentB.qml b/tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/PureQmlModule/ComponentB.qml index fac5d8f4b9..fac5d8f4b9 100644 --- a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/PureQmlModule/ComponentB.qml +++ b/tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/PureQmlModule/ComponentB.qml diff --git a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/PureQmlModule/qmldir b/tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/PureQmlModule/qmldir index 167bb10c21..167bb10c21 100644 --- a/tests/auto/qml/qqmlmoduleplugin/imports/com/nokia/PureQmlModule/qmldir +++ b/tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/PureQmlModule/qmldir diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/invalidFirstCommandModule.pro b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/invalidFirstCommandModule.pro index 8e37a2d16b..9a6ee63b88 100644 --- a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/invalidFirstCommandModule.pro +++ b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/invalidFirstCommandModule.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp QT = core qml -DESTDIR = ../imports/com/nokia/InvalidFirstCommandModule +DESTDIR = ../imports/org/qtproject/InvalidFirstCommandModule QT += core-private gui-private qml-private diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/plugin.cpp b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/plugin.cpp index 925f3cdf86..f8f1386e84 100644 --- a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/plugin.cpp +++ b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/plugin.cpp @@ -61,8 +61,8 @@ public: void registerTypes(const char *uri) { - Q_ASSERT(QLatin1String(uri) == "com.nokia.InvalidFirstCommandModule"); - qmlRegisterType<MyPluginType>("com.nokia.InvalidFirstCommandModule", 1, 0, "MyPluginType"); + Q_ASSERT(QLatin1String(uri) == "org.qtproject.InvalidFirstCommandModule"); + qmlRegisterType<MyPluginType>("org.qtproject.InvalidFirstCommandModule", 1, 0, "MyPluginType"); } }; diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/qmldir b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/qmldir index 90b607e793..9ecbf14516 100644 --- a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/qmldir +++ b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/qmldir @@ -1,3 +1,3 @@ plugin invalidNamespaceModule -module com.nokia.InvalidFirstCommandModule +module org.qtproject.InvalidFirstCommandModule # comment. diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/invalidNamespaceModule.pro b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/invalidNamespaceModule.pro index b53ae1f9c3..002f177cfd 100644 --- a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/invalidNamespaceModule.pro +++ b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/invalidNamespaceModule.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp QT = core qml -DESTDIR = ../imports/com/nokia/InvalidNamespaceModule +DESTDIR = ../imports/org/qtproject/InvalidNamespaceModule QT += core-private gui-private qml-private diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/plugin.cpp b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/plugin.cpp index 0ed1b20446..edf524a240 100644 --- a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/plugin.cpp +++ b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/plugin.cpp @@ -61,8 +61,8 @@ public: void registerTypes(const char *uri) { - Q_ASSERT(QLatin1String(uri) == "com.nokia.InvalidStrictModule"); - qmlRegisterType<MyPluginType>("com.nokia.SomeOtherModule", 1, 0, "MyPluginType"); + Q_ASSERT(QLatin1String(uri) == "org.qtproject.InvalidStrictModule"); + qmlRegisterType<MyPluginType>("org.qtproject.SomeOtherModule", 1, 0, "MyPluginType"); } }; diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/qmldir b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/qmldir index 5f349709f2..051e88d46e 100644 --- a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/qmldir +++ b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/qmldir @@ -1,2 +1,2 @@ -module com.nokia.AwesomeModule +module org.qtproject.AwesomeModule plugin invalidNamespaceModule diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidStrictModule/invalidStrictModule.pro b/tests/auto/qml/qqmlmoduleplugin/invalidStrictModule/invalidStrictModule.pro index a348d5d6a6..562d109179 100644 --- a/tests/auto/qml/qqmlmoduleplugin/invalidStrictModule/invalidStrictModule.pro +++ b/tests/auto/qml/qqmlmoduleplugin/invalidStrictModule/invalidStrictModule.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp QT = core qml -DESTDIR = ../imports/com/nokia/InvalidStrictModule +DESTDIR = ../imports/org/qtproject/InvalidStrictModule QT += core-private gui-private qml-private diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidStrictModule/plugin.cpp b/tests/auto/qml/qqmlmoduleplugin/invalidStrictModule/plugin.cpp index 0ed1b20446..edf524a240 100644 --- a/tests/auto/qml/qqmlmoduleplugin/invalidStrictModule/plugin.cpp +++ b/tests/auto/qml/qqmlmoduleplugin/invalidStrictModule/plugin.cpp @@ -61,8 +61,8 @@ public: void registerTypes(const char *uri) { - Q_ASSERT(QLatin1String(uri) == "com.nokia.InvalidStrictModule"); - qmlRegisterType<MyPluginType>("com.nokia.SomeOtherModule", 1, 0, "MyPluginType"); + Q_ASSERT(QLatin1String(uri) == "org.qtproject.InvalidStrictModule"); + qmlRegisterType<MyPluginType>("org.qtproject.SomeOtherModule", 1, 0, "MyPluginType"); } }; diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidStrictModule/qmldir b/tests/auto/qml/qqmlmoduleplugin/invalidStrictModule/qmldir index 45752a9bca..20716dc9f9 100644 --- a/tests/auto/qml/qqmlmoduleplugin/invalidStrictModule/qmldir +++ b/tests/auto/qml/qqmlmoduleplugin/invalidStrictModule/qmldir @@ -1,2 +1,2 @@ -module com.nokia.InvalidStrictModule +module org.qtproject.InvalidStrictModule plugin invalidStrictModule diff --git a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/nestedPlugin.cpp b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/nestedPlugin.cpp index 8b434dfb12..edd5577335 100644 --- a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/nestedPlugin.cpp +++ b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/nestedPlugin.cpp @@ -76,7 +76,7 @@ public: void registerTypes(const char *uri) { - Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestQmlNestedPluginType"); + Q_ASSERT(QLatin1String(uri) == "org.qtproject.AutoTestQmlNestedPluginType"); qmlRegisterType<MyPluginType>(uri, 1, 0, "MyPluginType"); QString nestedUri(uri); diff --git a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/nestedPlugin.pro b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/nestedPlugin.pro index a2e582a604..5636941951 100644 --- a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/nestedPlugin.pro +++ b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/nestedPlugin.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += nestedPlugin SOURCES = nestedPlugin.cpp QT = core qml -DESTDIR = ../imports/com/nokia/AutoTestQmlNestedPluginType +DESTDIR = ../imports/org/qtproject/AutoTestQmlNestedPluginType QT += core-private gui-private qml-private diff --git a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/nonstrictModule.pro b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/nonstrictModule.pro index 5ad1bd5eca..0d900eb707 100644 --- a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/nonstrictModule.pro +++ b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/nonstrictModule.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp QT = core qml -DESTDIR = ../imports/com/nokia/NonstrictModule +DESTDIR = ../imports/org/qtproject/NonstrictModule QT += core-private gui-private qml-private diff --git a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/plugin.cpp b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/plugin.cpp index 1cdd0f7754..f6db5bf9ea 100644 --- a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/plugin.cpp +++ b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/plugin.cpp @@ -61,10 +61,10 @@ public: void registerTypes(const char *uri) { - Q_ASSERT(QLatin1String(uri) == "com.nokia.NonstrictModule"); + Q_ASSERT(QLatin1String(uri) == "org.qtproject.NonstrictModule"); // Install into a namespace that should be protected - qmlRegisterType<MyPluginType>("com.nokia.StrictModule", 1, 0, "MyPluginType"); + qmlRegisterType<MyPluginType>("org.qtproject.StrictModule", 1, 0, "MyPluginType"); } }; diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/plugin.2.1.pro b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/plugin.2.1.pro index 560450832c..445b98d647 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/plugin.2.1.pro +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/plugin.2.1.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp QT = core qml -DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType.2.1 +DESTDIR = ../imports/org/qtproject/AutoTestQmlPluginType.2.1 QT += core-private gui-private qml-private diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/plugin.cpp b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/plugin.cpp index 6b5c38f29a..360f387310 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/plugin.cpp +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/plugin.cpp @@ -76,7 +76,7 @@ public: void registerTypes(const char *uri) { - Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestQmlPluginType"); + Q_ASSERT(QLatin1String(uri) == "org.qtproject.AutoTestQmlPluginType"); qmlRegisterType<MyPluginType>(uri, 2, 1, "MyPluginType"); } }; diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/plugin.2.pro b/tests/auto/qml/qqmlmoduleplugin/plugin.2/plugin.2.pro index ed70708e1d..00c076d9cf 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/plugin.2.pro +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/plugin.2.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp QT = core qml -DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType.2 +DESTDIR = ../imports/org/qtproject/AutoTestQmlPluginType.2 QT += core-private gui-private qml-private diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/plugin.cpp b/tests/auto/qml/qqmlmoduleplugin/plugin.2/plugin.cpp index 12e31a4cb8..41c6987462 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/plugin.cpp +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/plugin.cpp @@ -76,7 +76,7 @@ public: void registerTypes(const char *uri) { - Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestQmlPluginType"); + Q_ASSERT(QLatin1String(uri) == "org.qtproject.AutoTestQmlPluginType"); qmlRegisterType<MyPluginType>(uri, 2, 0, "MyPluginType"); } }; diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/plugin.cpp b/tests/auto/qml/qqmlmoduleplugin/plugin/plugin.cpp index ee07c77e2f..59f7fa1082 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin/plugin.cpp +++ b/tests/auto/qml/qqmlmoduleplugin/plugin/plugin.cpp @@ -75,7 +75,7 @@ public: void registerTypes(const char *uri) { - Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestQmlPluginType"); + Q_ASSERT(QLatin1String(uri) == "org.qtproject.AutoTestQmlPluginType"); qmlRegisterType<MyPluginType>(uri, 1, 0, "MyPluginType"); } }; diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/plugin.pro b/tests/auto/qml/qqmlmoduleplugin/plugin/plugin.pro index b78e85c86b..3a0455569e 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin/plugin.pro +++ b/tests/auto/qml/qqmlmoduleplugin/plugin/plugin.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp QT = core qml -DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType +DESTDIR = ../imports/org/qtproject/AutoTestQmlPluginType QT += core-private gui-private qml-private diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/plugin.cpp b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/plugin.cpp index 4512f9a642..bce746afd4 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/plugin.cpp +++ b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/plugin.cpp @@ -65,7 +65,7 @@ public: void registerTypes(const char *uri) { - Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestQmlMixedPluginType"); + Q_ASSERT(QLatin1String(uri) == "org.qtproject.AutoTestQmlMixedPluginType"); qmlRegisterType<BarPluginType>(uri, 1, 0, "Bar"); } }; diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/pluginMixed.pro b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/pluginMixed.pro index 9076c3ebab..d3b237b0f7 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/pluginMixed.pro +++ b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/pluginMixed.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp QT = core qml -DESTDIR = ../imports/com/nokia/AutoTestQmlMixedPluginType +DESTDIR = ../imports/org/qtproject/AutoTestQmlMixedPluginType QT += core-private gui-private qml-private diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/plugin.cpp b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/plugin.cpp index dfe2262e36..1ac546c39f 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/plugin.cpp +++ b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/plugin.cpp @@ -65,7 +65,7 @@ public: void registerTypes(const char *uri) { - Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestQmlVersionPluginType"); + Q_ASSERT(QLatin1String(uri) == "org.qtproject.AutoTestQmlVersionPluginType"); qmlRegisterType<FloorPluginType>(uri, 1, 4, "Floor"); } }; diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/pluginVersion.pro b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/pluginVersion.pro index ba07180953..5cec9b8ebd 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/pluginVersion.pro +++ b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/pluginVersion.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp QT = core qml -DESTDIR = ../imports/com/nokia/AutoTestQmlVersionPluginType +DESTDIR = ../imports/org/qtproject/AutoTestQmlVersionPluginType QT += core-private gui-private qml-private diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/plugin.cpp b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/plugin.cpp index 34cf311b6b..9f8af9e5fa 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/plugin.cpp +++ b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/plugin.cpp @@ -51,7 +51,7 @@ class MyPlugin : public QQmlExtensionPlugin public: void registerTypes(const char *uri) { - Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestPluginWithQmlFile"); + Q_ASSERT(QLatin1String(uri) == "org.qtproject.AutoTestPluginWithQmlFile"); } }; diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro index 8cb40456cf..ba66d60f18 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro +++ b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp QT = core qml -DESTDIR = ../imports/com/nokia/AutoTestPluginWithQmlFile +DESTDIR = ../imports/org/qtproject/AutoTestPluginWithQmlFile QT += core-private gui-private qml-private diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/plugin.cpp b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/plugin.cpp index 3daba28b3d..96a61fa8c4 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/plugin.cpp +++ b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/plugin.cpp @@ -75,7 +75,7 @@ public: void registerTypes(const char *uri) { - Q_ASSERT(QLatin1String(uri) == "com.nokia.WrongCase"); + Q_ASSERT(QLatin1String(uri) == "org.qtproject.WrongCase"); qmlRegisterType<MyPluginType>(uri, 1, 0, "MyPluginType"); } }; diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/pluginWrongCase.pro b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/pluginWrongCase.pro index 0e3757b6ca..99bac141de 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/pluginWrongCase.pro +++ b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/pluginWrongCase.pro @@ -3,7 +3,7 @@ CONFIG += plugin SOURCES = plugin.cpp QT = core qml TARGET = Plugin -DESTDIR = ../imports/com/nokia/WrongCase +DESTDIR = ../imports/org/qtproject/WrongCase QT += core-private gui-private qml-private diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/plugin.cpp b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/plugin.cpp index 1b73f02934..11c75a8dd5 100644 --- a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/plugin.cpp +++ b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/plugin.cpp @@ -61,7 +61,7 @@ public: void registerTypes(const char *uri) { - Q_ASSERT(QLatin1String(uri) == "com.nokia.PreemptedStrictModule"); + Q_ASSERT(QLatin1String(uri) == "org.qtproject.PreemptedStrictModule"); qmlRegisterType<MyPluginType>(uri, 1, 0, "MyPluginType"); } }; diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/preemptedStrictModule.pro b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/preemptedStrictModule.pro index 0aab522d04..22926bf1ca 100644 --- a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/preemptedStrictModule.pro +++ b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/preemptedStrictModule.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp QT = core qml -DESTDIR = ../imports/com/nokia/PreemptedStrictModule +DESTDIR = ../imports/org/qtproject/PreemptedStrictModule QT += core-private gui-private qml-private diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/qmldir b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/qmldir index c82acd2fd3..28deed1561 100644 --- a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/qmldir +++ b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/qmldir @@ -1,2 +1,2 @@ -module com.nokia.PreemptedStrictModule +module org.qtproject.PreemptedStrictModule plugin preemptedStrictModule diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/plugin.cpp b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/plugin.cpp index 3a62650b13..35e8670509 100644 --- a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/plugin.cpp +++ b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/plugin.cpp @@ -61,11 +61,11 @@ public: void registerTypes(const char *uri) { - Q_ASSERT(QLatin1String(uri) == "com.nokia.PreemptiveModule"); - qmlRegisterType<MyPluginType>("com.nokia.PreemptiveModule", 1, 0, "MyPluginType"); + Q_ASSERT(QLatin1String(uri) == "org.qtproject.PreemptiveModule"); + qmlRegisterType<MyPluginType>("org.qtproject.PreemptiveModule", 1, 0, "MyPluginType"); // Install into another namespace that should be protected - qmlRegisterType<MyPluginType>("com.nokia.PreemptedStrictModule", 1, 0, "MyPluginType"); + qmlRegisterType<MyPluginType>("org.qtproject.PreemptedStrictModule", 1, 0, "MyPluginType"); } }; diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/preemptiveModule.pro b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/preemptiveModule.pro index 5bb6520b80..c07f0621f7 100644 --- a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/preemptiveModule.pro +++ b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/preemptiveModule.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp QT = core qml -DESTDIR = ../imports/com/nokia/PreemptiveModule +DESTDIR = ../imports/org/qtproject/PreemptiveModule QT += core-private gui-private qml-private diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule/plugin.cpp b/tests/auto/qml/qqmlmoduleplugin/strictModule/plugin.cpp index 8353c6b012..e2849f8b64 100644 --- a/tests/auto/qml/qqmlmoduleplugin/strictModule/plugin.cpp +++ b/tests/auto/qml/qqmlmoduleplugin/strictModule/plugin.cpp @@ -61,7 +61,7 @@ public: void registerTypes(const char *uri) { - Q_ASSERT(QLatin1String(uri) == "com.nokia.StrictModule"); + Q_ASSERT(QLatin1String(uri) == "org.qtproject.StrictModule"); qmlRegisterType<MyPluginType>(uri, 1, 0, "MyPluginType"); } }; diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule/qmldir b/tests/auto/qml/qqmlmoduleplugin/strictModule/qmldir index ff06446fbd..26c408587d 100644 --- a/tests/auto/qml/qqmlmoduleplugin/strictModule/qmldir +++ b/tests/auto/qml/qqmlmoduleplugin/strictModule/qmldir @@ -1,2 +1,2 @@ -module com.nokia.StrictModule +module org.qtproject.StrictModule plugin strictModule diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule/strictModule.pro b/tests/auto/qml/qqmlmoduleplugin/strictModule/strictModule.pro index 7b818c0481..bf1c5df1a7 100644 --- a/tests/auto/qml/qqmlmoduleplugin/strictModule/strictModule.pro +++ b/tests/auto/qml/qqmlmoduleplugin/strictModule/strictModule.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp QT = core qml -DESTDIR = ../imports/com/nokia/StrictModule +DESTDIR = ../imports/org/qtproject/StrictModule QT += core-private gui-private qml-private diff --git a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp index 147bdb6ffb..25c08f82a2 100644 --- a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp +++ b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp @@ -142,7 +142,7 @@ void tst_qqmlmoduleplugin::importsPlugin() engine.addImportPath(m_importsDirectory); QTest::ignoreMessage(QtWarningMsg, "plugin created"); QTest::ignoreMessage(QtWarningMsg, "import worked"); - QTest::ignoreMessage(QtWarningMsg, "Module 'com.nokia.AutoTestQmlPluginType' does not contain a module identifier directive - it cannot be protected from external registrations."); + QTest::ignoreMessage(QtWarningMsg, "Module 'org.qtproject.AutoTestQmlPluginType' does not contain a module identifier directive - it cannot be protected from external registrations."); QQmlComponent component(&engine, testFileUrl(QStringLiteral("works.qml"))); foreach (QQmlError err, component.errors()) qWarning() << err; @@ -159,7 +159,7 @@ void tst_qqmlmoduleplugin::importsPlugin2() engine.addImportPath(m_importsDirectory); QTest::ignoreMessage(QtWarningMsg, "plugin2 created"); QTest::ignoreMessage(QtWarningMsg, "import2 worked"); - QTest::ignoreMessage(QtWarningMsg, "Module 'com.nokia.AutoTestQmlPluginType' does not contain a module identifier directive - it cannot be protected from external registrations."); + QTest::ignoreMessage(QtWarningMsg, "Module 'org.qtproject.AutoTestQmlPluginType' does not contain a module identifier directive - it cannot be protected from external registrations."); QQmlComponent component(&engine, testFileUrl(QStringLiteral("works2.qml"))); foreach (QQmlError err, component.errors()) qWarning() << err; @@ -176,7 +176,7 @@ void tst_qqmlmoduleplugin::importsPlugin21() engine.addImportPath(m_importsDirectory); QTest::ignoreMessage(QtWarningMsg, "plugin2.1 created"); QTest::ignoreMessage(QtWarningMsg, "import2.1 worked"); - QTest::ignoreMessage(QtWarningMsg, "Module 'com.nokia.AutoTestQmlPluginType' does not contain a module identifier directive - it cannot be protected from external registrations."); + QTest::ignoreMessage(QtWarningMsg, "Module 'org.qtproject.AutoTestQmlPluginType' does not contain a module identifier directive - it cannot be protected from external registrations."); QQmlComponent component(&engine, testFileUrl(QStringLiteral("works21.qml"))); foreach (QQmlError err, component.errors()) qWarning() << err; @@ -203,9 +203,9 @@ void tst_qqmlmoduleplugin::incorrectPluginCase() #elif defined(Q_OS_WIN32) QString libname = "PluGin.dll"; #endif - QString expectedError = QLatin1String("plugin cannot be loaded for module \"com.nokia.WrongCase\": File name case mismatch for \"") + QDir(m_importsDirectory).filePath("com/nokia/WrongCase/" + libname) + QLatin1String("\""); + QString expectedError = QLatin1String("plugin cannot be loaded for module \"org.qtproject.WrongCase\": File name case mismatch for \"") + QDir(m_importsDirectory).filePath("org/qtproject/WrongCase/" + libname) + QLatin1String("\""); #else - QString expectedError = QLatin1String("module \"com.nokia.WrongCase\" plugin \"PluGin\" not found"); + QString expectedError = QLatin1String("module \"org.qtproject.WrongCase\" plugin \"PluGin\" not found"); #endif #ifdef Q_OS_OSX @@ -229,7 +229,7 @@ void tst_qqmlmoduleplugin::importPluginWithQmlFile() QQmlEngine engine; engine.addImportPath(path); - QTest::ignoreMessage(QtWarningMsg, "Module 'com.nokia.AutoTestPluginWithQmlFile' does not contain a module identifier directive - it cannot be protected from external registrations."); + QTest::ignoreMessage(QtWarningMsg, "Module 'org.qtproject.AutoTestPluginWithQmlFile' does not contain a module identifier directive - it cannot be protected from external registrations."); QQmlComponent component(&engine, testFileUrl(QStringLiteral("pluginWithQmlFile.qml"))); foreach (QQmlError err, component.errors()) @@ -248,7 +248,7 @@ void tst_qqmlmoduleplugin::remoteImportWithQuotedUrl() QQmlEngine engine; QQmlComponent component(&engine); - component.setData("import \"" SERVER_ADDR "/com/nokia/PureQmlModule\" \nComponentA { width: 300; ComponentB{} }", QUrl()); + component.setData("import \"" SERVER_ADDR "/org/qtproject/PureQmlModule\" \nComponentA { width: 300; ComponentB{} }", QUrl()); QTRY_COMPARE(component.status(), QQmlComponent::Ready); QObject *object = component.create(); @@ -270,7 +270,7 @@ void tst_qqmlmoduleplugin::remoteImportWithUnquotedUri() QQmlEngine engine; engine.addImportPath(m_dataImportsDirectory); QQmlComponent component(&engine); - component.setData("import com.nokia.PureQmlModule 1.0 \nComponentA { width: 300; ComponentB{} }", QUrl()); + component.setData("import org.qtproject.PureQmlModule 1.0 \nComponentA { width: 300; ComponentB{} }", QUrl()); QTRY_COMPARE(component.status(), QQmlComponent::Ready); @@ -291,7 +291,7 @@ void tst_qqmlmoduleplugin::importsMixedQmlCppPlugin() QQmlEngine engine; engine.addImportPath(m_importsDirectory); - QTest::ignoreMessage(QtWarningMsg, "Module 'com.nokia.AutoTestQmlMixedPluginType' does not contain a module identifier directive - it cannot be protected from external registrations."); + QTest::ignoreMessage(QtWarningMsg, "Module 'org.qtproject.AutoTestQmlMixedPluginType' does not contain a module identifier directive - it cannot be protected from external registrations."); { QQmlComponent component(&engine, testFileUrl(QStringLiteral("importsMixedQmlCppPlugin.qml"))); @@ -334,7 +334,7 @@ void tst_qqmlmoduleplugin::versionNotInstalled() static int count = 0; if (++count == 1) - QTest::ignoreMessage(QtWarningMsg, "Module 'com.nokia.AutoTestQmlVersionPluginType' does not contain a module identifier directive - it cannot be protected from external registrations."); + QTest::ignoreMessage(QtWarningMsg, "Module 'org.qtproject.AutoTestQmlVersionPluginType' does not contain a module identifier directive - it cannot be protected from external registrations."); QQmlComponent component(&engine, testFileUrl(file)); VERIFY_ERRORS(errorFile.toLatin1().constData()); @@ -406,7 +406,7 @@ void tst_qqmlmoduleplugin::importsNested() static int count = 0; if (++count == 1) - QTest::ignoreMessage(QtWarningMsg, "Module 'com.nokia.AutoTestQmlNestedPluginType' does not contain a module identifier directive - it cannot be protected from external registrations."); + QTest::ignoreMessage(QtWarningMsg, "Module 'org.qtproject.AutoTestQmlNestedPluginType' does not contain a module identifier directive - it cannot be protected from external registrations."); QQmlComponent component(&engine, testFile(file)); QObject *obj = component.create(); @@ -506,38 +506,38 @@ void tst_qqmlmoduleplugin::importStrictModule_data() QTest::addColumn<QString>("error"); QTest::newRow("success") - << "import com.nokia.StrictModule 1.0\n" + << "import org.qtproject.StrictModule 1.0\n" "MyPluginType {}" << QString() << QString(); QTest::newRow("wrong target") - << "import com.nokia.InvalidStrictModule 1.0\n" + << "import org.qtproject.InvalidStrictModule 1.0\n" "MyPluginType {}" << QString() - << ":1:1: plugin cannot be loaded for module \"com.nokia.InvalidStrictModule\": Cannot install element 'MyPluginType' into unregistered namespace 'com.nokia.SomeOtherModule'"; + << ":1:1: plugin cannot be loaded for module \"org.qtproject.InvalidStrictModule\": Cannot install element 'MyPluginType' into unregistered namespace 'org.qtproject.SomeOtherModule'"; QTest::newRow("non-strict clash") - << "import com.nokia.NonstrictModule 1.0\n" + << "import org.qtproject.NonstrictModule 1.0\n" "MyPluginType {}" - << "Module 'com.nokia.NonstrictModule' does not contain a module identifier directive - it cannot be protected from external registrations." - << ":1:1: plugin cannot be loaded for module \"com.nokia.NonstrictModule\": Cannot install element 'MyPluginType' into protected namespace 'com.nokia.StrictModule'"; + << "Module 'org.qtproject.NonstrictModule' does not contain a module identifier directive - it cannot be protected from external registrations." + << ":1:1: plugin cannot be loaded for module \"org.qtproject.NonstrictModule\": Cannot install element 'MyPluginType' into protected namespace 'org.qtproject.StrictModule'"; QTest::newRow("non-strict preemption") - << "import com.nokia.PreemptiveModule 1.0\n" - "import com.nokia.PreemptedStrictModule 1.0\n" + << "import org.qtproject.PreemptiveModule 1.0\n" + "import org.qtproject.PreemptedStrictModule 1.0\n" "MyPluginType {}" - << "Module 'com.nokia.PreemptiveModule' does not contain a module identifier directive - it cannot be protected from external registrations." - << ":2:1: plugin cannot be loaded for module \"com.nokia.PreemptedStrictModule\": Namespace 'com.nokia.PreemptedStrictModule' has already been used for type registration"; + << "Module 'org.qtproject.PreemptiveModule' does not contain a module identifier directive - it cannot be protected from external registrations." + << ":2:1: plugin cannot be loaded for module \"org.qtproject.PreemptedStrictModule\": Namespace 'org.qtproject.PreemptedStrictModule' has already been used for type registration"; QTest::newRow("invalid namespace") - << "import com.nokia.InvalidNamespaceModule 1.0\n" + << "import org.qtproject.InvalidNamespaceModule 1.0\n" "MyPluginType {}" << QString() - << ":1:1: plugin cannot be loaded for module \"com.nokia.InvalidNamespaceModule\": Module namespace 'com.nokia.AwesomeModule' does not match import URI 'com.nokia.InvalidNamespaceModule'"; + << ":1:1: plugin cannot be loaded for module \"org.qtproject.InvalidNamespaceModule\": Module namespace 'org.qtproject.AwesomeModule' does not match import URI 'org.qtproject.InvalidNamespaceModule'"; QTest::newRow("module directive must be first") - << "import com.nokia.InvalidFirstCommandModule 1.0\n" + << "import org.qtproject.InvalidFirstCommandModule 1.0\n" "MyPluginType {}" << QString() << ":1:1: module identifier directive must be the first directive in a qmldir file"; |