summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernd Weimer <bernd.weimer@pelagicore.com>2020-09-16 11:16:21 +0200
committerBernd Weimer <bernd.weimer@pelagicore.com>2020-09-21 13:26:26 +0200
commitc77202bd69d9589fac1be14b4e32e09b8e23d061 (patch)
tree887af1db19d27cf3cdf95e3c22ae9fa748aed410
parent1726639c3ccd5b8ed9d462516b7b9502bde06c96 (diff)
Register AmTest in QtApplicationManager.SystemUI
Change-Id: I1d73e252470b0539cf3f41958c2841f73d7553ac Reviewed-by: Robert Griebl <robert.griebl@qt.io>
-rw-r--r--src/tools/testrunner/testrunner.cpp2
-rw-r--r--tests/qml/configs/tst_configs.qml1
-rw-r--r--tests/qml/installer/tst_installer.qml1
-rw-r--r--tests/qml/lifecycle/tst_lifecycle.qml1
-rw-r--r--tests/qml/processtitle/tst_processtitle.qml1
-rw-r--r--tests/qml/windowitem/tst_windowitem.qml1
-rw-r--r--tests/qml/windowmapping/tst_windowmapping.qml1
7 files changed, 1 insertions, 7 deletions
diff --git a/src/tools/testrunner/testrunner.cpp b/src/tools/testrunner/testrunner.cpp
index f787d038..b518098b 100644
--- a/src/tools/testrunner/testrunner.cpp
+++ b/src/tools/testrunner/testrunner.cpp
@@ -130,7 +130,7 @@ void TestRunner::initialize(const QString &testFile, const QStringList &testRunn
// Register the test object and application manager test add-on
qmlRegisterSingletonType<QTestRootObject>("Qt.test.qtestroot", 1, 0, "QTestRootObject", testRootObject);
- qmlRegisterSingletonType<AmTest>("QtApplicationManager", 2, 0, "AmTest", amTest);
+ qmlRegisterSingletonType<AmTest>("QtApplicationManager.SystemUI", 2, 0, "AmTest", amTest);
QTestRootObject::instance()->init();
}
diff --git a/tests/qml/configs/tst_configs.qml b/tests/qml/configs/tst_configs.qml
index 6acbb67c..56f19cda 100644
--- a/tests/qml/configs/tst_configs.qml
+++ b/tests/qml/configs/tst_configs.qml
@@ -42,7 +42,6 @@
import QtQuick 2.4
import QtTest 1.0
-import QtApplicationManager 2.0
import QtApplicationManager.SystemUI 2.0
diff --git a/tests/qml/installer/tst_installer.qml b/tests/qml/installer/tst_installer.qml
index 58cb1000..7ea663be 100644
--- a/tests/qml/installer/tst_installer.qml
+++ b/tests/qml/installer/tst_installer.qml
@@ -44,7 +44,6 @@
import QtQuick 2.3
import QtTest 1.0
import QtApplicationManager.SystemUI 2.0
-import QtApplicationManager 2.0
TestCase {
name: "Installer"
diff --git a/tests/qml/lifecycle/tst_lifecycle.qml b/tests/qml/lifecycle/tst_lifecycle.qml
index b191223f..3cb5cf3c 100644
--- a/tests/qml/lifecycle/tst_lifecycle.qml
+++ b/tests/qml/lifecycle/tst_lifecycle.qml
@@ -41,7 +41,6 @@
import QtQuick 2.11
import QtTest 1.0
-import QtApplicationManager 2.0
import QtApplicationManager.SystemUI 2.0
TestCase {
diff --git a/tests/qml/processtitle/tst_processtitle.qml b/tests/qml/processtitle/tst_processtitle.qml
index aea790a6..a94b7e86 100644
--- a/tests/qml/processtitle/tst_processtitle.qml
+++ b/tests/qml/processtitle/tst_processtitle.qml
@@ -41,7 +41,6 @@
import QtQuick 2.15
import QtTest 1.0
-import QtApplicationManager 2.0
import QtApplicationManager.SystemUI 2.0
diff --git a/tests/qml/windowitem/tst_windowitem.qml b/tests/qml/windowitem/tst_windowitem.qml
index 2a144667..94c3675c 100644
--- a/tests/qml/windowitem/tst_windowitem.qml
+++ b/tests/qml/windowitem/tst_windowitem.qml
@@ -42,7 +42,6 @@
import QtQuick 2.3
import QtTest 1.0
-import QtApplicationManager 2.0
import QtApplicationManager.SystemUI 2.0
Item {
diff --git a/tests/qml/windowmapping/tst_windowmapping.qml b/tests/qml/windowmapping/tst_windowmapping.qml
index 05ae5bbf..a0dfe468 100644
--- a/tests/qml/windowmapping/tst_windowmapping.qml
+++ b/tests/qml/windowmapping/tst_windowmapping.qml
@@ -43,7 +43,6 @@
import QtQuick 2.3
import QtTest 1.0
import QtApplicationManager.SystemUI 2.0
-import QtApplicationManager 2.0
TestCase {
id: testCase