diff options
author | Robert Griebl <robert.griebl@pelagicore.com> | 2018-12-12 15:07:54 +0100 |
---|---|---|
committer | Dominik Holland <dominik.holland@pelagicore.com> | 2018-12-18 12:52:53 +0000 |
commit | 2d9dfed7ffbbe93ba7cf90912f40a5f86ef80268 (patch) | |
tree | e00fc087ca04c5d533e2634a12db4ad05613265e | |
parent | 171f91fd66ced094f226f481d9765f4cf67c6019 (diff) |
Bump all QtApplicationManager QML imports to 2.0
Change-Id: I98bab2070b7a35cefae46bca8a06bac4a1cf1487
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Ilya A, Galkin <igalkin@luxoft.com>
Reviewed-by: Bramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com>
93 files changed, 155 insertions, 152 deletions
diff --git a/benchmarks/appman-bench/system-ui/main.qml b/benchmarks/appman-bench/system-ui/main.qml index de8f50cb..b5b88dfc 100644 --- a/benchmarks/appman-bench/system-ui/main.qml +++ b/benchmarks/appman-bench/system-ui/main.qml @@ -52,7 +52,7 @@ import QtQuick 2.8 import QtQuick.Window 2.2 -import QtApplicationManager.SystemUI 1.0 +import QtApplicationManager.SystemUI 2.0 Window { id: root diff --git a/benchmarks/appman-bench/templates/appman-qml/main.qml b/benchmarks/appman-bench/templates/appman-qml/main.qml index 02fa0fe4..ff2615a2 100644 --- a/benchmarks/appman-bench/templates/appman-qml/main.qml +++ b/benchmarks/appman-bench/templates/appman-qml/main.qml @@ -51,7 +51,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { id: root diff --git a/doc/migration-guide-5.12.qdoc b/doc/migration-guide-5.12.qdoc index 499167df..df2e38c8 100644 --- a/doc/migration-guide-5.12.qdoc +++ b/doc/migration-guide-5.12.qdoc @@ -62,6 +62,9 @@ table briefly explains each of them: not import this module. \endtable +In order to avoid compatibility problems with old code expecting the old APIs, \b all imports have +been bumped up to version \c 2.0. Importing the \c 1.0 versions will just yield a QML error. + \section1 ApplicationManager and applications @@ -79,7 +82,7 @@ if (application.state === AppMan.Application.Installed) { ... } \newcode -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ... if (application.state === ApplicationObject.Installed) { ... diff --git a/doc/qmlmodule.qdoc b/doc/qmlmodule.qdoc index 0190be63..249ec9e4 100644 --- a/doc/qmlmodule.qdoc +++ b/doc/qmlmodule.qdoc @@ -27,21 +27,21 @@ /*! - \qmlmodule QtApplicationManager.SystemUI 1.0 + \qmlmodule QtApplicationManager.SystemUI 2.0 \title Qt Application Manager System-UI QML types \ingroup qmlmodules */ /*! - \qmlmodule QtApplicationManager.Application 1.0 + \qmlmodule QtApplicationManager.Application 2.0 \title Qt Application Manager Application QML types \ingroup qmlmodules */ /*! - \qmlmodule QtApplicationManager 1.0 + \qmlmodule QtApplicationManager 2.0 \title Qt Application Manager QML types common to System-UI and applications \ingroup qmlmodules */ diff --git a/dummyimports/QtApplicationManager/ApplicationManagerWindow.qml b/dummyimports/QtApplicationManager/ApplicationManagerWindow.qml index 7739a992..c48d4e9e 100644 --- a/dummyimports/QtApplicationManager/ApplicationManagerWindow.qml +++ b/dummyimports/QtApplicationManager/ApplicationManagerWindow.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtApplicationManager.SystemUI 1.0 +import QtApplicationManager.SystemUI 2.0 Item { id: root diff --git a/dummyimports/QtApplicationManager/WindowManager.qml b/dummyimports/QtApplicationManager/WindowManager.qml index 262e976f..bf9e7de3 100644 --- a/dummyimports/QtApplicationManager/WindowManager.qml +++ b/dummyimports/QtApplicationManager/WindowManager.qml @@ -41,7 +41,7 @@ pragma Singleton import QtQuick 2.2 -import QtApplicationManager.SystemUI 1.0 +import QtApplicationManager.SystemUI 2.0 QtObject { id: root diff --git a/dummyimports/QtApplicationManager/qmldir b/dummyimports/QtApplicationManager/qmldir index 6af7b9d7..7753156d 100644 --- a/dummyimports/QtApplicationManager/qmldir +++ b/dummyimports/QtApplicationManager/qmldir @@ -1,7 +1,7 @@ -singleton ApplicationManager 1.0 ApplicationManager.qml -ApplicationManagerWindow 1.0 ApplicationManagerWindow.qml -ApplicationInstaller 1.0 ApplicationInstaller.js -ApplicationIPCInterface 1.0 ApplicationIPCInterface.qml -Notification 1.0 Notification.qml -singleton WindowManager 1.0 WindowManager.qml -singleton SystemMonitor 1.0 SystemMonitor.qml +singleton ApplicationManager 2.0 ApplicationManager.qml +ApplicationManagerWindow 2.0 ApplicationManagerWindow.qml +ApplicationInstaller 2.0 ApplicationInstaller.js +ApplicationIPCInterface 2.0 ApplicationIPCInterface.qml +Notification 2.0 Notification.qml +singleton WindowManager 2.0 WindowManager.qml +singleton SystemMonitor 2.0 SystemMonitor.qml diff --git a/examples/applicationmanager/animated-windows/apps/animated-windows.fish/fish.qml b/examples/applicationmanager/animated-windows/apps/animated-windows.fish/fish.qml index 6a4127e8..9aeeda0e 100644 --- a/examples/applicationmanager/animated-windows/apps/animated-windows.fish/fish.qml +++ b/examples/applicationmanager/animated-windows/apps/animated-windows.fish/fish.qml @@ -51,7 +51,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { id: root diff --git a/examples/applicationmanager/animated-windows/apps/animated-windows.rabbit/rabbit.qml b/examples/applicationmanager/animated-windows/apps/animated-windows.rabbit/rabbit.qml index 4e38ce61..baf88367 100644 --- a/examples/applicationmanager/animated-windows/apps/animated-windows.rabbit/rabbit.qml +++ b/examples/applicationmanager/animated-windows/apps/animated-windows.rabbit/rabbit.qml @@ -51,7 +51,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { id: root diff --git a/examples/applicationmanager/animated-windows/system-ui/main.qml b/examples/applicationmanager/animated-windows/system-ui/main.qml index 818eeeae..f5e035ba 100644 --- a/examples/applicationmanager/animated-windows/system-ui/main.qml +++ b/examples/applicationmanager/animated-windows/system-ui/main.qml @@ -52,7 +52,7 @@ import QtQuick 2.4 import QtQuick.Layouts 1.11 -import QtApplicationManager.SystemUI 1.0 +import QtApplicationManager.SystemUI 2.0 Rectangle { width: 1024 diff --git a/examples/applicationmanager/frame-timer/apps/frame-timer.fish/fish.qml b/examples/applicationmanager/frame-timer/apps/frame-timer.fish/fish.qml index d6ae4bc3..feb5be03 100644 --- a/examples/applicationmanager/frame-timer/apps/frame-timer.fish/fish.qml +++ b/examples/applicationmanager/frame-timer/apps/frame-timer.fish/fish.qml @@ -51,7 +51,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { id: root diff --git a/examples/applicationmanager/frame-timer/apps/frame-timer.rabbit/rabbit.qml b/examples/applicationmanager/frame-timer/apps/frame-timer.rabbit/rabbit.qml index 4e38ce61..baf88367 100644 --- a/examples/applicationmanager/frame-timer/apps/frame-timer.rabbit/rabbit.qml +++ b/examples/applicationmanager/frame-timer/apps/frame-timer.rabbit/rabbit.qml @@ -51,7 +51,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { id: root diff --git a/examples/applicationmanager/frame-timer/system-ui/main.qml b/examples/applicationmanager/frame-timer/system-ui/main.qml index 2c13f84c..e84bc58d 100644 --- a/examples/applicationmanager/frame-timer/system-ui/main.qml +++ b/examples/applicationmanager/frame-timer/system-ui/main.qml @@ -53,8 +53,8 @@ import QtQuick 2.11 import QtQuick.Layouts 1.11 import QtQuick.Window 2.11 -import QtApplicationManager 1.0 -import QtApplicationManager.SystemUI 1.0 +import QtApplicationManager 2.0 +import QtApplicationManager.SystemUI 2.0 Window { id: sysuiWindow diff --git a/examples/applicationmanager/hello-world/apps/hello-world.blue/main.qml b/examples/applicationmanager/hello-world/apps/hello-world.blue/main.qml index 5d1afac7..53d9df3b 100644 --- a/examples/applicationmanager/hello-world/apps/hello-world.blue/main.qml +++ b/examples/applicationmanager/hello-world/apps/hello-world.blue/main.qml @@ -51,7 +51,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { color: "blue" diff --git a/examples/applicationmanager/hello-world/apps/hello-world.green/main.qml b/examples/applicationmanager/hello-world/apps/hello-world.green/main.qml index 916e2827..f8b02497 100644 --- a/examples/applicationmanager/hello-world/apps/hello-world.green/main.qml +++ b/examples/applicationmanager/hello-world/apps/hello-world.green/main.qml @@ -51,7 +51,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { color: "Green" diff --git a/examples/applicationmanager/hello-world/apps/hello-world.red/main.qml b/examples/applicationmanager/hello-world/apps/hello-world.red/main.qml index bba3216c..b8c86827 100644 --- a/examples/applicationmanager/hello-world/apps/hello-world.red/main.qml +++ b/examples/applicationmanager/hello-world/apps/hello-world.red/main.qml @@ -51,7 +51,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { color: "red" diff --git a/examples/applicationmanager/hello-world/system-ui.qml b/examples/applicationmanager/hello-world/system-ui.qml index 5cad6306..c9ca286c 100644 --- a/examples/applicationmanager/hello-world/system-ui.qml +++ b/examples/applicationmanager/hello-world/system-ui.qml @@ -51,7 +51,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.SystemUI 1.0 +import QtApplicationManager.SystemUI 2.0 Item { width: 800 diff --git a/examples/applicationmanager/intents/shared/IntentClient.qml b/examples/applicationmanager/intents/shared/IntentClient.qml index d3ed6d8b..70bfac50 100644 --- a/examples/applicationmanager/intents/shared/IntentClient.qml +++ b/examples/applicationmanager/intents/shared/IntentClient.qml @@ -51,8 +51,8 @@ ****************************************************************************/ import QtQuick 2.11 -import QtApplicationManager.Application 1.0 -import QtApplicationManager 1.0 +import QtApplicationManager.Application 2.0 +import QtApplicationManager 2.0 ApplicationManagerWindow { id: root diff --git a/examples/applicationmanager/intents/system-ui.qml b/examples/applicationmanager/intents/system-ui.qml index fd031f6b..2202e4fe 100644 --- a/examples/applicationmanager/intents/system-ui.qml +++ b/examples/applicationmanager/intents/system-ui.qml @@ -53,8 +53,8 @@ import QtQuick 2.11 import QtQuick.Controls 2.4 import QtQuick.Layouts 1.4 -import QtApplicationManager.SystemUI 1.0 -import QtApplicationManager 1.0 +import QtApplicationManager.SystemUI 2.0 +import QtApplicationManager 2.0 import "shared" Item { diff --git a/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/app1.qml b/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/app1.qml index ecf65b85..d3bb1414 100644 --- a/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/app1.qml +++ b/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/app1.qml @@ -51,7 +51,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { id: root diff --git a/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/app2.qml b/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/app2.qml index 045afbb9..1c92fa9d 100644 --- a/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/app2.qml +++ b/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/app2.qml @@ -51,7 +51,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { color: ApplicationInterface.systemProperties.light ? "peachpuff" : "black" diff --git a/examples/applicationmanager/minidesk/system-ui/main.qml b/examples/applicationmanager/minidesk/system-ui/main.qml index 153abd91..49fb8bb7 100644 --- a/examples/applicationmanager/minidesk/system-ui/main.qml +++ b/examples/applicationmanager/minidesk/system-ui/main.qml @@ -51,7 +51,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.SystemUI 1.0 +import QtApplicationManager.SystemUI 2.0 Rectangle { width: 1024 diff --git a/examples/applicationmanager/multi-views/apps/tld.multi-views.app/app1.qml b/examples/applicationmanager/multi-views/apps/tld.multi-views.app/app1.qml index 9627ff1b..8f0ee38a 100644 --- a/examples/applicationmanager/multi-views/apps/tld.multi-views.app/app1.qml +++ b/examples/applicationmanager/multi-views/apps/tld.multi-views.app/app1.qml @@ -51,7 +51,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { id: root diff --git a/examples/applicationmanager/multi-views/system-ui/main.qml b/examples/applicationmanager/multi-views/system-ui/main.qml index 301d29a1..2dd27175 100644 --- a/examples/applicationmanager/multi-views/system-ui/main.qml +++ b/examples/applicationmanager/multi-views/system-ui/main.qml @@ -51,7 +51,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.SystemUI 1.0 +import QtApplicationManager.SystemUI 2.0 Rectangle { width: 1024 diff --git a/examples/applicationmanager/process-status/apps/process-status.cpu-hog/main.qml b/examples/applicationmanager/process-status/apps/process-status.cpu-hog/main.qml index f38964cc..d820c18a 100644 --- a/examples/applicationmanager/process-status/apps/process-status.cpu-hog/main.qml +++ b/examples/applicationmanager/process-status/apps/process-status.cpu-hog/main.qml @@ -51,7 +51,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { color: "red" diff --git a/examples/applicationmanager/process-status/apps/process-status.mem-hog/main.qml b/examples/applicationmanager/process-status/apps/process-status.mem-hog/main.qml index ba62b988..8d454719 100644 --- a/examples/applicationmanager/process-status/apps/process-status.mem-hog/main.qml +++ b/examples/applicationmanager/process-status/apps/process-status.mem-hog/main.qml @@ -51,7 +51,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { id: root diff --git a/examples/applicationmanager/process-status/apps/process-status.slim/main.qml b/examples/applicationmanager/process-status/apps/process-status.slim/main.qml index 5967789b..6a14f58f 100644 --- a/examples/applicationmanager/process-status/apps/process-status.slim/main.qml +++ b/examples/applicationmanager/process-status/apps/process-status.slim/main.qml @@ -51,7 +51,7 @@ ****************************************************************************/ import QtQuick 2.11 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { color: "blue" diff --git a/examples/applicationmanager/process-status/system-ui/ApplicationDisplay.qml b/examples/applicationmanager/process-status/system-ui/ApplicationDisplay.qml index 652cffd4..3e7e587a 100644 --- a/examples/applicationmanager/process-status/system-ui/ApplicationDisplay.qml +++ b/examples/applicationmanager/process-status/system-ui/ApplicationDisplay.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.SystemUI 1.0 +import QtApplicationManager.SystemUI 2.0 import QtQuick.Controls 2.4 import QtQuick.Layouts 1.11 diff --git a/examples/applicationmanager/process-status/system-ui/CpuGraph.qml b/examples/applicationmanager/process-status/system-ui/CpuGraph.qml index 109e902b..40791295 100644 --- a/examples/applicationmanager/process-status/system-ui/CpuGraph.qml +++ b/examples/applicationmanager/process-status/system-ui/CpuGraph.qml @@ -41,8 +41,8 @@ import QtQuick 2.11 import QtQuick.Controls 2.4 -import QtApplicationManager 1.0 -import QtApplicationManager.SystemUI 1.0 +import QtApplicationManager 2.0 +import QtApplicationManager.SystemUI 2.0 /* This file shows how to use ProcessStatus inside a MonitorModel to draw a graph diff --git a/examples/applicationmanager/process-status/system-ui/Stats.qml b/examples/applicationmanager/process-status/system-ui/Stats.qml index 69e4d3ea..56726906 100644 --- a/examples/applicationmanager/process-status/system-ui/Stats.qml +++ b/examples/applicationmanager/process-status/system-ui/Stats.qml @@ -41,7 +41,7 @@ import QtQuick 2.4 import QtQuick.Controls 2.4 -import QtApplicationManager.SystemUI 1.0 +import QtApplicationManager.SystemUI 2.0 /* This file shows how to use ProcessStatus alongside a Timer (instead of putting it inside a MonitorModel) diff --git a/examples/applicationmanager/process-status/system-ui/main.qml b/examples/applicationmanager/process-status/system-ui/main.qml index 5bc7cf68..3711ef01 100644 --- a/examples/applicationmanager/process-status/system-ui/main.qml +++ b/examples/applicationmanager/process-status/system-ui/main.qml @@ -41,7 +41,7 @@ import QtQuick 2.4 import QtQuick.Controls 2.4 -import QtApplicationManager.SystemUI 1.0 +import QtApplicationManager.SystemUI 2.0 Pane { width: 900 diff --git a/src/installer-lib/applicationinstaller.cpp b/src/installer-lib/applicationinstaller.cpp index cc605be9..f79a6bb2 100644 --- a/src/installer-lib/applicationinstaller.cpp +++ b/src/installer-lib/applicationinstaller.cpp @@ -246,7 +246,7 @@ ApplicationInstaller *ApplicationInstaller::createInstance(const QVector<Install return nullptr; } - qmlRegisterSingletonType<ApplicationInstaller>("QtApplicationManager.SystemUI", 1, 0, "ApplicationInstaller", + qmlRegisterSingletonType<ApplicationInstaller>("QtApplicationManager.SystemUI", 2, 0, "ApplicationInstaller", &ApplicationInstaller::instanceForQml); return s_instance = new ApplicationInstaller(installationLocations, manifestDir.take(), imageMountDir.take(), diff --git a/src/installer-lib/applicationinstaller.h b/src/installer-lib/applicationinstaller.h index a96f2e04..f15ee5b6 100644 --- a/src/installer-lib/applicationinstaller.h +++ b/src/installer-lib/applicationinstaller.h @@ -64,7 +64,7 @@ class ApplicationInstaller : public QObject { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "io.qt.ApplicationInstaller") - Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ApplicationInstaller 1.0") + Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ApplicationInstaller 2.0") // both are const on purpose - these should never change in a running system Q_PROPERTY(bool allowInstallationOfUnsignedPackages READ allowInstallationOfUnsignedPackages CONSTANT) diff --git a/src/intent-client-lib/intentclient.cpp b/src/intent-client-lib/intentclient.cpp index 175660c2..5c425bf3 100644 --- a/src/intent-client-lib/intentclient.cpp +++ b/src/intent-client-lib/intentclient.cpp @@ -70,15 +70,15 @@ IntentClient *IntentClient::createInstance(IntentClientSystemInterface *systemIn qCWarning(LogIntents) << "Failed to initialize IntentClient:" << exc.what(); return nullptr; } - qmlRegisterSingletonType<IntentClient>("QtApplicationManager", 1, 0, "IntentClient", + qmlRegisterSingletonType<IntentClient>("QtApplicationManager", 2, 0, "IntentClient", [](QQmlEngine *, QJSEngine *) -> QObject * { QQmlEngine::setObjectOwnership(instance(), QQmlEngine::CppOwnership); return instance(); }); - qmlRegisterUncreatableType<IntentClientRequest>("QtApplicationManager", 1, 0, "IntentRequest", + qmlRegisterUncreatableType<IntentClientRequest>("QtApplicationManager", 2, 0, "IntentRequest", qSL("Cannot create objects of type IntentRequest")); - qmlRegisterType<IntentHandler>("QtApplicationManager.Application", 1, 0, "IntentHandler"); + qmlRegisterType<IntentHandler>("QtApplicationManager.Application", 2, 0, "IntentHandler"); return s_instance = ic.take(); } diff --git a/src/intent-server-lib/intentserver.cpp b/src/intent-server-lib/intentserver.cpp index 072bb6e8..dbf181da 100644 --- a/src/intent-server-lib/intentserver.cpp +++ b/src/intent-server-lib/intentserver.cpp @@ -77,12 +77,12 @@ IntentServer *IntentServer::createInstance(IntentServerSystemInterface *systemIn qRegisterMetaType<QVariantList>("IntentList"); // needed to get access to the Visibility enum from QML - qmlRegisterUncreatableType<Intent>("QtApplicationManager.SystemUI", 1, 0, "Intent", + qmlRegisterUncreatableType<Intent>("QtApplicationManager.SystemUI", 2, 0, "Intent", qSL("Cannot create objects of type Intent")); - qmlRegisterUncreatableType<IntentServerRequest>("QtApplicationManager.SystemUI", 1, 0, "IntentServerRequest", + qmlRegisterUncreatableType<IntentServerRequest>("QtApplicationManager.SystemUI", 2, 0, "IntentServerRequest", qSL("Cannot create objects of type IntentServerRequest")); - qmlRegisterSingletonType<IntentServer>("QtApplicationManager.SystemUI", 1, 0, "IntentServer", + qmlRegisterSingletonType<IntentServer>("QtApplicationManager.SystemUI", 2, 0, "IntentServer", [](QQmlEngine *, QJSEngine *) -> QObject * { QQmlEngine::setObjectOwnership(instance(), QQmlEngine::CppOwnership); return instance(); diff --git a/src/launcher-lib/applicationmanagerwindow.cpp b/src/launcher-lib/applicationmanagerwindow.cpp index 05d646c2..c8cbdba9 100644 --- a/src/launcher-lib/applicationmanagerwindow.cpp +++ b/src/launcher-lib/applicationmanagerwindow.cpp @@ -71,13 +71,13 @@ public: The QML import for this item is - \c{import QtApplicationManager.Application 1.0} + \c{import QtApplicationManager.Application 2.0} After importing, you can instantiate the QML item like so: \qml import QtQuick 2.0 - import QtApplicationManager.Application 1.0 + import QtApplicationManager.Application 2.0 ApplicationManagerWindow { Text { @@ -92,7 +92,7 @@ public: \list 1 \li Pick a base dir and create a \c{QtApplicationManager.Application} directory in it - \li Add a file named \c qmldir there, consisting of the single line \c{ApplicationManagerWindow 1.0 ApplicationManagerWindow.qml} + \li Add a file named \c qmldir there, consisting of the single line \c{ApplicationManagerWindow 2.0 ApplicationManagerWindow.qml} \li Add a second file named \c ApplicationManagerWindow.qml, with the following content \qml diff --git a/src/launcher-lib/applicationmanagerwindow_p.h b/src/launcher-lib/applicationmanagerwindow_p.h index 25a0b2c1..7b6b4ff0 100644 --- a/src/launcher-lib/applicationmanagerwindow_p.h +++ b/src/launcher-lib/applicationmanagerwindow_p.h @@ -53,7 +53,7 @@ class ApplicationManagerWindowPrivate; class ApplicationManagerWindow : public QQuickWindowQmlImpl { Q_OBJECT - Q_CLASSINFO("AM-QmlType", "QtApplicationManager.Application/ApplicationManagerWindow 1.0") + Q_CLASSINFO("AM-QmlType", "QtApplicationManager.Application/ApplicationManagerWindow 2.0") public: explicit ApplicationManagerWindow(QWindow *parent = nullptr); diff --git a/src/launcher-lib/qmlapplicationinterface.h b/src/launcher-lib/qmlapplicationinterface.h index 8a431ef1..82bf028c 100644 --- a/src/launcher-lib/qmlapplicationinterface.h +++ b/src/launcher-lib/qmlapplicationinterface.h @@ -63,7 +63,7 @@ class QmlApplicationInterfaceExtension; class QmlApplicationInterface : public ApplicationInterface { Q_OBJECT - Q_CLASSINFO("AM-QmlType", "QtApplicationManager.Application/ApplicationInterface 1.0") + Q_CLASSINFO("AM-QmlType", "QtApplicationManager.Application/ApplicationInterface 2.0") public: explicit QmlApplicationInterface(const QString &dbusConnectionName, diff --git a/src/launcher-lib/qmlapplicationinterfaceextension.h b/src/launcher-lib/qmlapplicationinterfaceextension.h index 148ee556..a2e76566 100644 --- a/src/launcher-lib/qmlapplicationinterfaceextension.h +++ b/src/launcher-lib/qmlapplicationinterfaceextension.h @@ -54,7 +54,7 @@ class QmlApplicationInterfaceExtensionPrivate; class QmlApplicationInterfaceExtension : public QObject, public QQmlParserStatus { Q_OBJECT - Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ApplicationInterfaceExtension 1.0") + Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ApplicationInterfaceExtension 2.0") Q_INTERFACES(QQmlParserStatus) Q_PROPERTY(QString name READ name WRITE setName) diff --git a/src/main-lib/main.cpp b/src/main-lib/main.cpp index 1c81d28a..70f94776 100644 --- a/src/main-lib/main.cpp +++ b/src/main-lib/main.cpp @@ -617,21 +617,21 @@ void Main::setupQmlEngine(const QStringList &importPaths, const QString &quickCo if (!quickControlsStyle.isEmpty()) qputenv("QT_QUICK_CONTROLS_STYLE", quickControlsStyle.toLocal8Bit()); - qmlRegisterType<QmlInProcessNotification>("QtApplicationManager", 1, 0, "Notification"); - qmlRegisterType<QmlInProcessApplicationInterfaceExtension>("QtApplicationManager.Application", 1, 0, "ApplicationInterfaceExtension"); + qmlRegisterType<QmlInProcessNotification>("QtApplicationManager", 2, 0, "Notification"); + qmlRegisterType<QmlInProcessApplicationInterfaceExtension>("QtApplicationManager.Application", 2, 0, "ApplicationInterfaceExtension"); #if !defined(AM_HEADLESS) - qmlRegisterType<QmlInProcessApplicationManagerWindow>("QtApplicationManager.Application", 1, 0, "ApplicationManagerWindow"); + qmlRegisterType<QmlInProcessApplicationManagerWindow>("QtApplicationManager.Application", 2, 0, "ApplicationManagerWindow"); #endif // monitor-lib - qmlRegisterType<CpuStatus>("QtApplicationManager", 1, 0, "CpuStatus"); - qmlRegisterType<FrameTimer>("QtApplicationManager", 1, 0, "FrameTimer"); - qmlRegisterType<GpuStatus>("QtApplicationManager", 1, 0, "GpuStatus"); - qmlRegisterType<IoStatus>("QtApplicationManager", 1, 0, "IoStatus"); - qmlRegisterType<MemoryStatus>("QtApplicationManager", 1, 0, "MemoryStatus"); - qmlRegisterType<MonitorModel>("QtApplicationManager", 1, 0, "MonitorModel"); - qmlRegisterType<ProcessStatus>("QtApplicationManager.SystemUI", 1, 0, "ProcessStatus"); + qmlRegisterType<CpuStatus>("QtApplicationManager", 2, 0, "CpuStatus"); + qmlRegisterType<FrameTimer>("QtApplicationManager", 2, 0, "FrameTimer"); + qmlRegisterType<GpuStatus>("QtApplicationManager", 2, 0, "GpuStatus"); + qmlRegisterType<IoStatus>("QtApplicationManager", 2, 0, "IoStatus"); + qmlRegisterType<MemoryStatus>("QtApplicationManager", 2, 0, "MemoryStatus"); + qmlRegisterType<MonitorModel>("QtApplicationManager", 2, 0, "MonitorModel"); + qmlRegisterType<ProcessStatus>("QtApplicationManager.SystemUI", 2, 0, "ProcessStatus"); StartupTimer::instance()->checkpoint("after QML registrations"); diff --git a/src/manager-lib/abstractcontainer.h b/src/manager-lib/abstractcontainer.h index dd7a70a5..1edb35bc 100644 --- a/src/manager-lib/abstractcontainer.h +++ b/src/manager-lib/abstractcontainer.h @@ -99,7 +99,7 @@ signals: class AbstractContainer : public QObject { Q_OBJECT - Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/Container 1.0") + Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/Container 2.0") Q_PROPERTY(QString controlGroup READ controlGroup WRITE setControlGroup) diff --git a/src/manager-lib/abstractruntime.h b/src/manager-lib/abstractruntime.h index 765391e6..ded511a8 100644 --- a/src/manager-lib/abstractruntime.h +++ b/src/manager-lib/abstractruntime.h @@ -104,7 +104,7 @@ private: class AbstractRuntime : public QObject { Q_OBJECT - Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/Runtime 1.0") + Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/Runtime 2.0") Q_PROPERTY(AbstractContainer *container READ container) diff --git a/src/manager-lib/application.h b/src/manager-lib/application.h index 3a8d51af..bdc9d0eb 100644 --- a/src/manager-lib/application.h +++ b/src/manager-lib/application.h @@ -67,7 +67,7 @@ signals: class AbstractApplication : public QObject { Q_OBJECT - Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ApplicationObject 1.0") + Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ApplicationObject 2.0") Q_PROPERTY(QString id READ id CONSTANT) Q_PROPERTY(QString runtimeName READ runtimeName NOTIFY bulkChange) diff --git a/src/manager-lib/applicationipcmanager.cpp b/src/manager-lib/applicationipcmanager.cpp index f82ac5da..5726c93f 100644 --- a/src/manager-lib/applicationipcmanager.cpp +++ b/src/manager-lib/applicationipcmanager.cpp @@ -82,8 +82,8 @@ ApplicationIPCManager *ApplicationIPCManager::createInstance() qFatal("ApplicationIPCManager::createInstance() was called a second time."); qmlRegisterType<ApplicationIPCInterfaceAttached>(); - qmlRegisterType<ApplicationIPCInterface>("QtApplicationManager.SystemUI", 1, 0, "ApplicationIPCInterface"); - qmlRegisterSingletonType<ApplicationIPCManager>("QtApplicationManager.SystemUI", 1, 0, "ApplicationIPCManager", + qmlRegisterType<ApplicationIPCInterface>("QtApplicationManager.SystemUI", 2, 0, "ApplicationIPCInterface"); + qmlRegisterSingletonType<ApplicationIPCManager>("QtApplicationManager.SystemUI", 2, 0, "ApplicationIPCManager", &ApplicationIPCManager::instanceForQml); return s_instance = new ApplicationIPCManager(); } @@ -195,7 +195,7 @@ ApplicationIPCManager::ApplicationIPCManager(QObject *parent) \qml import QtQuick 2.0 - import QtApplicationManager.SystemUI 1.0 + import QtApplicationManager.SystemUI 2.0 ApplicationIPCInterface { id: extension diff --git a/src/manager-lib/applicationipcmanager.h b/src/manager-lib/applicationipcmanager.h index 5c63e4d8..60e92b98 100644 --- a/src/manager-lib/applicationipcmanager.h +++ b/src/manager-lib/applicationipcmanager.h @@ -64,7 +64,7 @@ class Application; class ApplicationIPCManager : public QObject { Q_OBJECT - Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ApplicationIPCManager 1.0") + Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ApplicationIPCManager 2.0") public: ~ApplicationIPCManager(); diff --git a/src/manager-lib/applicationmanager.cpp b/src/manager-lib/applicationmanager.cpp index 8474204a..ef89106b 100644 --- a/src/manager-lib/applicationmanager.cpp +++ b/src/manager-lib/applicationmanager.cpp @@ -173,7 +173,7 @@ \qml import QtQuick 2.0 - import QtApplicationManager.SystemUI 1.0 + import QtApplicationManager.SystemUI 2.0 ListView { id: appList @@ -384,20 +384,20 @@ ApplicationManager *ApplicationManager::createInstance(bool singleProcess) QScopedPointer<ApplicationManager> am(new ApplicationManager(singleProcess)); - qmlRegisterSingletonType<ApplicationManager>("QtApplicationManager.SystemUI", 1, 0, "ApplicationManager", + qmlRegisterSingletonType<ApplicationManager>("QtApplicationManager.SystemUI", 2, 0, "ApplicationManager", &ApplicationManager::instanceForQml); - qmlRegisterType<ApplicationModel>("QtApplicationManager.SystemUI", 1, 0, "ApplicationModel"); - qmlRegisterUncreatableType<AbstractApplication>("QtApplicationManager.SystemUI", 1, 0, "ApplicationObject", + qmlRegisterType<ApplicationModel>("QtApplicationManager.SystemUI", 2, 0, "ApplicationModel"); + qmlRegisterUncreatableType<AbstractApplication>("QtApplicationManager.SystemUI", 2, 0, "ApplicationObject", qSL("Cannot create objects of type ApplicationObject")); qRegisterMetaType<AbstractApplication*>("AbstractApplication*"); - qmlRegisterUncreatableType<AbstractRuntime>("QtApplicationManager.SystemUI", 1, 0, "Runtime", + qmlRegisterUncreatableType<AbstractRuntime>("QtApplicationManager.SystemUI", 2, 0, "Runtime", qSL("Cannot create objects of type Runtime")); qRegisterMetaType<AbstractRuntime*>("AbstractRuntime*"); - qmlRegisterUncreatableType<AbstractContainer>("QtApplicationManager.SystemUI", 1, 0, "Container", + qmlRegisterUncreatableType<AbstractContainer>("QtApplicationManager.SystemUI", 2, 0, "Container", qSL("Cannot create objects of type Container")); qRegisterMetaType<AbstractContainer*>("AbstractContainer*"); - qmlRegisterUncreatableType<Am>("QtApplicationManager.SystemUI", 1, 0, "Am", + qmlRegisterUncreatableType<Am>("QtApplicationManager.SystemUI", 2, 0, "Am", qSL("Cannot create objects of type Am")); qRegisterMetaType<Am::RunState>(); diff --git a/src/manager-lib/applicationmanager.h b/src/manager-lib/applicationmanager.h index 56e0ba80..344861ba 100644 --- a/src/manager-lib/applicationmanager.h +++ b/src/manager-lib/applicationmanager.h @@ -74,7 +74,7 @@ class ApplicationManager : public QAbstractListModel { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "io.qt.ApplicationManager") - Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ApplicationManager 1.0") + Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ApplicationManager 2.0") Q_PROPERTY(int count READ count NOTIFY countChanged) Q_PROPERTY(bool singleProcess READ isSingleProcess CONSTANT) diff --git a/src/manager-lib/applicationmodel.cpp b/src/manager-lib/applicationmodel.cpp index 2f5282be..c0354fbf 100644 --- a/src/manager-lib/applicationmodel.cpp +++ b/src/manager-lib/applicationmodel.cpp @@ -72,7 +72,7 @@ \qml import QtQuick 2.6 - import QtApplicationManager.SystemUI 1.0 + import QtApplicationManager.SystemUI 2.0 ListView { model: ApplicationModel { diff --git a/src/manager-lib/notificationmanager.cpp b/src/manager-lib/notificationmanager.cpp index ffdd2742..48804021 100644 --- a/src/manager-lib/notificationmanager.cpp +++ b/src/manager-lib/notificationmanager.cpp @@ -268,7 +268,7 @@ NotificationManager *NotificationManager::createInstance() if (Q_UNLIKELY(s_instance)) qFatal("NotificationManager::createInstance() was called a second time."); - qmlRegisterSingletonType<NotificationManager>("QtApplicationManager.SystemUI", 1, 0, "NotificationManager", + qmlRegisterSingletonType<NotificationManager>("QtApplicationManager.SystemUI", 2, 0, "NotificationManager", &NotificationManager::instanceForQml); return s_instance = new NotificationManager(); } diff --git a/src/manager-lib/notificationmanager.h b/src/manager-lib/notificationmanager.h index 1551dbfd..6d2c8385 100644 --- a/src/manager-lib/notificationmanager.h +++ b/src/manager-lib/notificationmanager.h @@ -56,7 +56,7 @@ class NotificationManager : public QAbstractListModel { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.freedesktop.Notifications") - Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/NotificationManager 1.0") + Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/NotificationManager 2.0") Q_PROPERTY(int count READ count NOTIFY countChanged) diff --git a/src/monitor-lib/cpustatus.cpp b/src/monitor-lib/cpustatus.cpp index 5bf2729c..1cb3b3f6 100644 --- a/src/monitor-lib/cpustatus.cpp +++ b/src/monitor-lib/cpustatus.cpp @@ -57,7 +57,7 @@ \qml import QtQuick 2.11 - import QtApplicationManager 1.0 + import QtApplicationManager 2.0 ... MonitorModel { CpuStatus {} @@ -68,7 +68,7 @@ \qml import QtQuick 2.11 - import QtApplicationManager 1.0 + import QtApplicationManager 2.0 ... CpuStatus { id: cpuStatus } Timer { diff --git a/src/monitor-lib/frametimer.cpp b/src/monitor-lib/frametimer.cpp index 534c3033..a284c625 100644 --- a/src/monitor-lib/frametimer.cpp +++ b/src/monitor-lib/frametimer.cpp @@ -61,7 +61,7 @@ \qml import QtQuick 2.11 - import QtApplicationManager 1.0 + import QtApplicationManager 2.0 Window { id: toplevelWindow @@ -82,7 +82,7 @@ \qml import QtQuick 2.11 - import QtApplicationManager 1.0 + import QtApplicationManager 2.0 Window { id: toplevelWindow diff --git a/src/monitor-lib/gpustatus.cpp b/src/monitor-lib/gpustatus.cpp index 7e375917..95c8f70f 100644 --- a/src/monitor-lib/gpustatus.cpp +++ b/src/monitor-lib/gpustatus.cpp @@ -54,7 +54,7 @@ \qml import QtQuick 2.11 - import QtApplicationManager 1.0 + import QtApplicationManager 2.0 ... GpuStatus { id: gpuStatus } Timer { @@ -74,7 +74,7 @@ \qml import QtQuick 2.11 - import QtApplicationManager 1.0 + import QtApplicationManager 2.0 ... MonitorModel { GpuStatus {} diff --git a/src/monitor-lib/iostatus.cpp b/src/monitor-lib/iostatus.cpp index 1fada231..c447f35f 100644 --- a/src/monitor-lib/iostatus.cpp +++ b/src/monitor-lib/iostatus.cpp @@ -57,7 +57,7 @@ \qml import QtQuick 2.11 - import QtApplicationManager 1.0 + import QtApplicationManager 2.0 ... MonitorModel { IoStatus { @@ -70,7 +70,7 @@ \qml import QtQuick 2.11 - import QtApplicationManager 1.0 + import QtApplicationManager 2.0 ... IoStatus { id: ioStatus diff --git a/src/monitor-lib/memorystatus.cpp b/src/monitor-lib/memorystatus.cpp index 3947bb0d..d16abfa6 100644 --- a/src/monitor-lib/memorystatus.cpp +++ b/src/monitor-lib/memorystatus.cpp @@ -55,7 +55,7 @@ \qml import QtQuick 2.11 - import QtApplicationManager 1.0 + import QtApplicationManager 2.0 ... MonitorModel { MemoryStatus {} @@ -66,7 +66,7 @@ \qml import QtQuick 2.11 - import QtApplicationManager 1.0 + import QtApplicationManager 2.0 ... MemoryStatus { id: memoryStatus } Timer { diff --git a/src/monitor-lib/monitormodel.cpp b/src/monitor-lib/monitormodel.cpp index 55fcd8b3..7e9297d4 100644 --- a/src/monitor-lib/monitormodel.cpp +++ b/src/monitor-lib/monitormodel.cpp @@ -63,7 +63,7 @@ \qml import QtQuick 2.11 - import QtApplicationManager 1.0 + import QtApplicationManager 2.0 ListView { id: listView diff --git a/src/monitor-lib/processstatus.cpp b/src/monitor-lib/processstatus.cpp index 47296657..f53c1d30 100644 --- a/src/monitor-lib/processstatus.cpp +++ b/src/monitor-lib/processstatus.cpp @@ -64,8 +64,8 @@ \qml import QtQuick 2.11 - import QtApplicationManager 1.0 - import QtApplicationManager.SystemUI 1.0 + import QtApplicationManager 2.0 + import QtApplicationManager.SystemUI 2.0 Item { id: root @@ -92,8 +92,8 @@ \qml import QtQuick 2.11 - import QtApplicationManager 1.0 - import QtApplicationManager.SystemUI 1.0 + import QtApplicationManager 2.0 + import QtApplicationManager.SystemUI 2.0 ... MonitorModel { running: true diff --git a/src/notification-lib/notification.h b/src/notification-lib/notification.h index e69a6113..74a83dd6 100644 --- a/src/notification-lib/notification.h +++ b/src/notification-lib/notification.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE_AM class Notification : public QObject, public QQmlParserStatus { Q_OBJECT - Q_CLASSINFO("AM-QmlType", "QtApplicationManager/Notification 1.0") + Q_CLASSINFO("AM-QmlType", "QtApplicationManager/Notification 2.0") Q_INTERFACES(QQmlParserStatus) Q_PROPERTY(uint notificationId READ notificationId NOTIFY notificationIdChanged) diff --git a/src/tools/launcher-qml/launcher-qml.cpp b/src/tools/launcher-qml/launcher-qml.cpp index 9efddb73..5ae1253e 100644 --- a/src/tools/launcher-qml/launcher-qml.cpp +++ b/src/tools/launcher-qml/launcher-qml.cpp @@ -177,18 +177,18 @@ Controller::Controller(LauncherMain *a, bool quickLaunched, const QString &direc CrashHandler::setQmlEngine(&m_engine); #if !defined(AM_HEADLESS) - qmlRegisterType<ApplicationManagerWindow>("QtApplicationManager.Application", 1, 0, "ApplicationManagerWindow"); + qmlRegisterType<ApplicationManagerWindow>("QtApplicationManager.Application", 2, 0, "ApplicationManagerWindow"); #endif - qmlRegisterType<QmlNotification>("QtApplicationManager", 1, 0, "Notification"); - qmlRegisterType<QmlApplicationInterfaceExtension>("QtApplicationManager.Application", 1, 0, "ApplicationInterfaceExtension"); + qmlRegisterType<QmlNotification>("QtApplicationManager", 2, 0, "Notification"); + qmlRegisterType<QmlApplicationInterfaceExtension>("QtApplicationManager.Application", 2, 0, "ApplicationInterfaceExtension"); // monitor-lib - qmlRegisterType<CpuStatus>("QtApplicationManager", 1, 0, "CpuStatus"); - qmlRegisterType<FrameTimer>("QtApplicationManager", 1, 0, "FrameTimer"); - qmlRegisterType<GpuStatus>("QtApplicationManager", 1, 0, "GpuStatus"); - qmlRegisterType<IoStatus>("QtApplicationManager", 1, 0, "IoStatus"); - qmlRegisterType<MemoryStatus>("QtApplicationManager", 1, 0, "MemoryStatus"); - qmlRegisterType<MonitorModel>("QtApplicationManager", 1, 0, "MonitorModel"); + qmlRegisterType<CpuStatus>("QtApplicationManager", 2, 0, "CpuStatus"); + qmlRegisterType<FrameTimer>("QtApplicationManager", 2, 0, "FrameTimer"); + qmlRegisterType<GpuStatus>("QtApplicationManager", 2, 0, "GpuStatus"); + qmlRegisterType<IoStatus>("QtApplicationManager", 2, 0, "IoStatus"); + qmlRegisterType<MemoryStatus>("QtApplicationManager", 2, 0, "MemoryStatus"); + qmlRegisterType<MonitorModel>("QtApplicationManager", 2, 0, "MonitorModel"); m_configuration = a->runtimeConfiguration(); diff --git a/src/tools/testrunner/testrunner.cpp b/src/tools/testrunner/testrunner.cpp index 06b3edc8..1b62388a 100644 --- a/src/tools/testrunner/testrunner.cpp +++ b/src/tools/testrunner/testrunner.cpp @@ -172,7 +172,7 @@ void TestRunner::initialize(const QStringList &testRunnerArguments) // Register the test object and application-manager test add-on qmlRegisterSingletonType<QTestRootObject>("Qt.test.qtestroot", 1, 0, "QTestRootObject", testRootObject); - qmlRegisterSingletonType<AmTest>("QtApplicationManager", 1, 0, "AmTest", amTest); + qmlRegisterSingletonType<AmTest>("QtApplicationManager", 2, 0, "AmTest", amTest); QTestRootObject::instance()->init(); } diff --git a/src/window-lib/windowmanager.cpp b/src/window-lib/windowmanager.cpp index dac603de..3e46868e 100644 --- a/src/window-lib/windowmanager.cpp +++ b/src/window-lib/windowmanager.cpp @@ -129,7 +129,7 @@ \qml import QtQuick 2.10 - import QtApplicationManager.SystemUI 1.0 + import QtApplicationManager.SystemUI 2.0 // Simple solution for a full-screen setup Item { @@ -243,13 +243,13 @@ WindowManager *WindowManager::createInstance(QQmlEngine *qmlEngine, const QStrin if (s_instance) qFatal("WindowManager::createInstance() was called a second time."); - qmlRegisterSingletonType<WindowManager>("QtApplicationManager.SystemUI", 1, 0, "WindowManager", + qmlRegisterSingletonType<WindowManager>("QtApplicationManager.SystemUI", 2, 0, "WindowManager", &WindowManager::instanceForQml); - qmlRegisterUncreatableType<Window>("QtApplicationManager.SystemUI", 1, 0, "WindowObject", qSL("Cannot create objects of type WindowObject")); + qmlRegisterUncreatableType<Window>("QtApplicationManager.SystemUI", 2, 0, "WindowObject", qSL("Cannot create objects of type WindowObject")); qRegisterMetaType<Window*>("Window*"); - qmlRegisterType<WindowItem>("QtApplicationManager.SystemUI", 1, 0, "WindowItem"); + qmlRegisterType<WindowItem>("QtApplicationManager.SystemUI", 2, 0, "WindowItem"); qRegisterMetaType<InProcessSurfaceItem*>("InProcessSurfaceItem*"); qRegisterMetaType<QSharedPointer<InProcessSurfaceItem>>("QSharedPointer<InProcessSurfaceItem>"); diff --git a/src/window-lib/windowmanager.h b/src/window-lib/windowmanager.h index 72270f29..2406275b 100644 --- a/src/window-lib/windowmanager.h +++ b/src/window-lib/windowmanager.h @@ -69,7 +69,7 @@ class WindowManager : public QAbstractListModel { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "io.qt.WindowManager") - Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/WindowManager 1.0") + Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/WindowManager 2.0") Q_PROPERTY(int count READ count NOTIFY countChanged) Q_PROPERTY(bool runningOnDesktop READ isRunningOnDesktop CONSTANT) diff --git a/tests/data/hello-world.red/main.qml b/tests/data/hello-world.red/main.qml index 1cdd6d91..29b2e715 100644 --- a/tests/data/hello-world.red/main.qml +++ b/tests/data/hello-world.red/main.qml @@ -1,5 +1,5 @@ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { color: "crimson" diff --git a/tests/main/builtin-apps/hello-world.red/main.qml b/tests/main/builtin-apps/hello-world.red/main.qml index 5d66635e..b225bdfc 100644 --- a/tests/main/builtin-apps/hello-world.red/main.qml +++ b/tests/main/builtin-apps/hello-world.red/main.qml @@ -1,5 +1,5 @@ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { color: "red" diff --git a/tests/main/dir-with-update-already-installed/apps/hello-world.red/main.qml b/tests/main/dir-with-update-already-installed/apps/hello-world.red/main.qml index 1cdd6d91..29b2e715 100644 --- a/tests/main/dir-with-update-already-installed/apps/hello-world.red/main.qml +++ b/tests/main/dir-with-update-already-installed/apps/hello-world.red/main.qml @@ -1,5 +1,5 @@ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { color: "crimson" diff --git a/tests/manual/monitormodel/main.qml b/tests/manual/monitormodel/main.qml index 50fedbb3..2198c17d 100644 --- a/tests/manual/monitormodel/main.qml +++ b/tests/manual/monitormodel/main.qml @@ -44,7 +44,7 @@ import QtQuick.Controls 2.4 import QtQuick.Layouts 1.11 import QtQuick.Window 2.11 -import QtApplicationManager.SystemUI 1.0 +import QtApplicationManager.SystemUI 2.0 Window { width: 1200 diff --git a/tests/qml/configs/apps/test.configs.app/app.qml b/tests/qml/configs/apps/test.configs.app/app.qml index 510eeee4..6f700160 100644 --- a/tests/qml/configs/apps/test.configs.app/app.qml +++ b/tests/qml/configs/apps/test.configs.app/app.qml @@ -40,8 +40,8 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager 1.0 -import QtApplicationManager.Application 1.0 +import QtApplicationManager 2.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { id: root diff --git a/tests/qml/configs/tst_configs.qml b/tests/qml/configs/tst_configs.qml index be2cce33..8111707b 100644 --- a/tests/qml/configs/tst_configs.qml +++ b/tests/qml/configs/tst_configs.qml @@ -41,7 +41,7 @@ import QtQuick 2.4 import QtTest 1.0 -import QtApplicationManager.SystemUI 1.0 +import QtApplicationManager.SystemUI 2.0 TestCase { diff --git a/tests/qml/crash/apps/tld.test.crash/app.qml b/tests/qml/crash/apps/tld.test.crash/app.qml index 84d0c414..cf02e90e 100644 --- a/tests/qml/crash/apps/tld.test.crash/app.qml +++ b/tests/qml/crash/apps/tld.test.crash/app.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.3 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 import Terminator 2.0 ApplicationManagerWindow { diff --git a/tests/qml/crash/tst_crash.qml b/tests/qml/crash/tst_crash.qml index cb08b701..eaf23846 100644 --- a/tests/qml/crash/tst_crash.qml +++ b/tests/qml/crash/tst_crash.qml @@ -41,7 +41,7 @@ import QtQuick 2.3 import QtTest 1.0 -import QtApplicationManager.SystemUI 1.0 +import QtApplicationManager.SystemUI 2.0 TestCase { id: testCase diff --git a/tests/qml/installer/tst_installer.qml b/tests/qml/installer/tst_installer.qml index 3ca91866..3e476220 100644 --- a/tests/qml/installer/tst_installer.qml +++ b/tests/qml/installer/tst_installer.qml @@ -41,7 +41,7 @@ import QtQuick 2.3 import QtTest 1.0 -import QtApplicationManager.SystemUI 1.0 +import QtApplicationManager.SystemUI 2.0 TestCase { name: "Installer" diff --git a/tests/qml/intents/apps/intents1/intents1.qml b/tests/qml/intents/apps/intents1/intents1.qml index a812044b..4248cc47 100644 --- a/tests/qml/intents/apps/intents1/intents1.qml +++ b/tests/qml/intents/apps/intents1/intents1.qml @@ -40,8 +40,8 @@ ****************************************************************************/ import QtQml 2.2 -import QtApplicationManager 1.0 -import QtApplicationManager.Application 1.0 +import QtApplicationManager 2.0 +import QtApplicationManager.Application 2.0 QtObject { id: root diff --git a/tests/qml/intents/apps/intents2/intents2.qml b/tests/qml/intents/apps/intents2/intents2.qml index 232dc077..29765a28 100644 --- a/tests/qml/intents/apps/intents2/intents2.qml +++ b/tests/qml/intents/apps/intents2/intents2.qml @@ -40,8 +40,8 @@ ****************************************************************************/ import QtQml 2.2 -import QtApplicationManager 1.0 -import QtApplicationManager.Application 1.0 +import QtApplicationManager 2.0 +import QtApplicationManager.Application 2.0 QtObject { id: root diff --git a/tests/qml/intents/tst_intents.qml b/tests/qml/intents/tst_intents.qml index abac65ef..ff2c373f 100644 --- a/tests/qml/intents/tst_intents.qml +++ b/tests/qml/intents/tst_intents.qml @@ -41,8 +41,8 @@ import QtQuick 2.4 import QtTest 1.0 -import QtApplicationManager 1.0 -import QtApplicationManager.SystemUI 1.0 +import QtApplicationManager 2.0 +import QtApplicationManager.SystemUI 2.0 TestCase { id: testCase diff --git a/tests/qml/quicklaunch/apps/tld.test.quicklaunch/app.qml b/tests/qml/quicklaunch/apps/tld.test.quicklaunch/app.qml index 34293fa0..1fc69fd7 100644 --- a/tests/qml/quicklaunch/apps/tld.test.quicklaunch/app.qml +++ b/tests/qml/quicklaunch/apps/tld.test.quicklaunch/app.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { width: 320 diff --git a/tests/qml/quicklaunch/tst_quicklaunch.qml b/tests/qml/quicklaunch/tst_quicklaunch.qml index e9fea1f9..42800365 100644 --- a/tests/qml/quicklaunch/tst_quicklaunch.qml +++ b/tests/qml/quicklaunch/tst_quicklaunch.qml @@ -41,7 +41,7 @@ import QtQuick 2.3 import QtTest 1.0 -import QtApplicationManager.SystemUI 1.0 +import QtApplicationManager.SystemUI 2.0 // Tests are meaningless in single-process mode, but still work diff --git a/tests/qml/simple/apps/tld.test.simple1/app1.qml b/tests/qml/simple/apps/tld.test.simple1/app1.qml index 25c570fd..e0f38dee 100644 --- a/tests/qml/simple/apps/tld.test.simple1/app1.qml +++ b/tests/qml/simple/apps/tld.test.simple1/app1.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { id: root diff --git a/tests/qml/simple/apps/tld.test.simple2/app.qml b/tests/qml/simple/apps/tld.test.simple2/app.qml index e7ddb8e9..ca5691f5 100644 --- a/tests/qml/simple/apps/tld.test.simple2/app.qml +++ b/tests/qml/simple/apps/tld.test.simple2/app.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { id: root diff --git a/tests/qml/simple/tst_applicationmanager.qml b/tests/qml/simple/tst_applicationmanager.qml index 2b7bc9d7..9c58d3b0 100644 --- a/tests/qml/simple/tst_applicationmanager.qml +++ b/tests/qml/simple/tst_applicationmanager.qml @@ -42,7 +42,7 @@ import QtQuick 2.3 import QtQuick.Window 2.0 import QtTest 1.0 -import QtApplicationManager.SystemUI 1.0 +import QtApplicationManager.SystemUI 2.0 TestCase { id: testCase diff --git a/tests/qml/windowitem/apps/test.windowitem.app/main.qml b/tests/qml/windowitem/apps/test.windowitem.app/main.qml index fc18043d..a4aae271 100644 --- a/tests/qml/windowitem/apps/test.windowitem.app/main.qml +++ b/tests/qml/windowitem/apps/test.windowitem.app/main.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { id: root diff --git a/tests/qml/windowitem/apps/test.windowitem.multiwin/main.qml b/tests/qml/windowitem/apps/test.windowitem.multiwin/main.qml index 64650cd0..e5821b24 100644 --- a/tests/qml/windowitem/apps/test.windowitem.multiwin/main.qml +++ b/tests/qml/windowitem/apps/test.windowitem.multiwin/main.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 /* A simple test app that displays two windows diff --git a/tests/qml/windowitem/tst_windowitem.qml b/tests/qml/windowitem/tst_windowitem.qml index a90fa1f0..9f7e9cba 100644 --- a/tests/qml/windowitem/tst_windowitem.qml +++ b/tests/qml/windowitem/tst_windowitem.qml @@ -41,7 +41,7 @@ import QtQuick 2.3 import QtTest 1.0 -import QtApplicationManager.SystemUI 1.0 +import QtApplicationManager.SystemUI 2.0 Item { id: root diff --git a/tests/qml/windowitem2/apps/test.windowitem2.app/main.qml b/tests/qml/windowitem2/apps/test.windowitem2.app/main.qml index 5f26a35b..1bb7da7c 100644 --- a/tests/qml/windowitem2/apps/test.windowitem2.app/main.qml +++ b/tests/qml/windowitem2/apps/test.windowitem2.app/main.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { color: "red" diff --git a/tests/qml/windowitem2/tst_windowitem2.qml b/tests/qml/windowitem2/tst_windowitem2.qml index ce7ab42b..d517888f 100644 --- a/tests/qml/windowitem2/tst_windowitem2.qml +++ b/tests/qml/windowitem2/tst_windowitem2.qml @@ -41,7 +41,7 @@ import QtQuick 2.3 import QtTest 1.0 -import QtApplicationManager.SystemUI 1.0 +import QtApplicationManager.SystemUI 2.0 Item { id: root diff --git a/tests/qml/windowmapping/apps/test.winmap.amwin/amwin.qml b/tests/qml/windowmapping/apps/test.winmap.amwin/amwin.qml index f7309d61..fdc4bbd4 100644 --- a/tests/qml/windowmapping/apps/test.winmap.amwin/amwin.qml +++ b/tests/qml/windowmapping/apps/test.winmap.amwin/amwin.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { id: root diff --git a/tests/qml/windowmapping/apps/test.winmap.amwin2/amwin2.qml b/tests/qml/windowmapping/apps/test.winmap.amwin2/amwin2.qml index 3da73886..1e6a13e3 100644 --- a/tests/qml/windowmapping/apps/test.winmap.amwin2/amwin2.qml +++ b/tests/qml/windowmapping/apps/test.winmap.amwin2/amwin2.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { id: root diff --git a/tests/qml/windowmapping/apps/test.winmap.loader/SubWin.qml b/tests/qml/windowmapping/apps/test.winmap.loader/SubWin.qml index b665c66a..1be8230f 100644 --- a/tests/qml/windowmapping/apps/test.winmap.loader/SubWin.qml +++ b/tests/qml/windowmapping/apps/test.winmap.loader/SubWin.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { Component.onCompleted: setWindowProperty("type", "sub"); diff --git a/tests/qml/windowmapping/apps/test.winmap.loader/loader.qml b/tests/qml/windowmapping/apps/test.winmap.loader/loader.qml index 644c149d..e392a300 100644 --- a/tests/qml/windowmapping/apps/test.winmap.loader/loader.qml +++ b/tests/qml/windowmapping/apps/test.winmap.loader/loader.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { id: root diff --git a/tests/qml/windowmapping/apps/test.winmap.ping/ping.qml b/tests/qml/windowmapping/apps/test.winmap.ping/ping.qml index 9860be8f..2b7f227e 100644 --- a/tests/qml/windowmapping/apps/test.winmap.ping/ping.qml +++ b/tests/qml/windowmapping/apps/test.winmap.ping/ping.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 ApplicationManagerWindow { Timer { diff --git a/tests/qml/windowmapping/apps/test.winmap.qtobject/qtobject.qml b/tests/qml/windowmapping/apps/test.winmap.qtobject/qtobject.qml index 00bfff83..72d716ee 100644 --- a/tests/qml/windowmapping/apps/test.winmap.qtobject/qtobject.qml +++ b/tests/qml/windowmapping/apps/test.winmap.qtobject/qtobject.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 QtObject { id: root diff --git a/tests/qml/windowmapping/apps/test.winmap.rectangle/rectangle.qml b/tests/qml/windowmapping/apps/test.winmap.rectangle/rectangle.qml index f77d10d4..476b9f67 100644 --- a/tests/qml/windowmapping/apps/test.winmap.rectangle/rectangle.qml +++ b/tests/qml/windowmapping/apps/test.winmap.rectangle/rectangle.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 Rectangle { id: root diff --git a/tests/qml/windowmapping/apps/test.winmap.window/window.qml b/tests/qml/windowmapping/apps/test.winmap.window/window.qml index c3892859..bd10899b 100644 --- a/tests/qml/windowmapping/apps/test.winmap.window/window.qml +++ b/tests/qml/windowmapping/apps/test.winmap.window/window.qml @@ -41,7 +41,7 @@ import QtQuick 2.4 import QtQuick.Window 2.0 -import QtApplicationManager.Application 1.0 +import QtApplicationManager.Application 2.0 Window { id: root diff --git a/tests/qml/windowmapping/tst_windowmapping.qml b/tests/qml/windowmapping/tst_windowmapping.qml index 702ed13e..d069badc 100644 --- a/tests/qml/windowmapping/tst_windowmapping.qml +++ b/tests/qml/windowmapping/tst_windowmapping.qml @@ -41,8 +41,8 @@ import QtQuick 2.3 import QtTest 1.0 -import QtApplicationManager.SystemUI 1.0 -import QtApplicationManager 1.0 +import QtApplicationManager.SystemUI 2.0 +import QtApplicationManager 2.0 TestCase { id: testCase |