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 /src | |
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>
Diffstat (limited to 'src')
31 files changed, 73 insertions, 73 deletions
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) |