Mark properties exposed to QML as FINAL to prevent shadowing

Change-Id: Iea724f9dce6358b628e0d73e44351a988a6a726d Fixes: QTBUG-114750 Pick-to: 6.6 Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>
author: Robert Griebl <robert.griebl@qt.io> 2023-06-22 02:03:17 +0200
committer: Robert Griebl <robert.griebl@qt.io> 2023-06-22 15:10:36 +0200
commit: aca5b6f7b3212c9f9a7860c12b7f3f4b6539ff42 (patch)
tree: d37ad19ecc2c4f459ef63541701ed06f27fb6d22
parent: 691f76d35fea7a9437f3a94bc08e0301db63e511 (diff)
37 files changed, 357 insertions, 355 deletions
diff --git a/qmltypes/QtApplicationManager/Application/plugins.qmltypes b/qmltypes/QtApplicationManager/Application/plugins.qmltypes
index 95eef8fc..584feab6 100644
--- a/qmltypes/QtApplicationManager/Application/plugins.qmltypes
+++ b/qmltypes/QtApplicationManager/Application/plugins.qmltypes
@@ -12,7 +12,7 @@ Module {
         exports: [ "QtApplicationManager.Application/IntentHandler 2.0" ]
         exportMetaObjectRevisions: [ 512 ]
         prototype: "AbstractIntentHandler"
-        Property { name: "intentIds"; type: "QStringList" }
+        Property { name: "intentIds"; type: "QStringList"; isFinal: true }
     }
     Component {
         name: "ApplicationManagerWindow"
@@ -46,12 +46,12 @@ Module {
         prototype: "QObject"
         isSingleton: true
         isCreatable: false
-        Property { name: "applicationId"; type: "QString"; isReadonly: true; isConstant: true }
-        Property { name: "name"; type: "QVariantMap"; isReadonly: true; isConstant: true }
-        Property { name: "icon"; type: "QUrl"; isReadonly: true; isConstant: true }
-        Property { name: "version"; type: "QString"; isReadonly: true; isConstant: true }
-        Property { name: "systemProperties"; type: "QVariantMap"; isReadonly: true; isConstant: true }
-        Property { name: "applicationProperties"; type: "QVariantMap"; isReadonly: true; isConstant: true }
+        Property { name: "applicationId"; type: "QString"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "name"; type: "QVariantMap"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "icon"; type: "QUrl"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "version"; type: "QString"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "systemProperties"; type: "QVariantMap"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "applicationProperties"; type: "QVariantMap"; isReadonly: true; isConstant: true; isFinal: true }
         Signal {
             name: "quit"
         }
diff --git a/qmltypes/QtApplicationManager/SystemUI/plugins.qmltypes b/qmltypes/QtApplicationManager/SystemUI/plugins.qmltypes
index 80673a83..d484144e 100644
--- a/qmltypes/QtApplicationManager/SystemUI/plugins.qmltypes
+++ b/qmltypes/QtApplicationManager/SystemUI/plugins.qmltypes
@@ -12,14 +12,14 @@ Module {
         exports: [ "QtApplicationManager.SystemUI/ProcessStatus 2.0" ]
         exportMetaObjectRevisions: [ 512 ]
         prototype: "QObject"
-        Property { name: "applicationId"; type: "QString" }
-        Property { name: "processId"; type: "qlonglong"; isReadonly: true }
-        Property { name: "cpuLoad"; type: "double"; isReadonly: true }
-        Property { name: "memoryVirtual"; type: "QVariantMap"; isReadonly: true }
-        Property { name: "memoryRss"; type: "QVariantMap"; isReadonly: true }
-        Property { name: "memoryPss"; type: "QVariantMap"; isReadonly: true }
+        Property { name: "applicationId"; type: "QString"; isFinal: true }
+        Property { name: "processId"; type: "qlonglong"; isReadonly: true; isFinal: true }
+        Property { name: "cpuLoad"; type: "double"; isReadonly: true; isFinal: true }
+        Property { name: "memoryVirtual"; type: "QVariantMap"; isReadonly: true; isFinal: true }
+        Property { name: "memoryRss"; type: "QVariantMap"; isReadonly: true; isFinal: true }
+        Property { name: "memoryPss"; type: "QVariantMap"; isReadonly: true; isFinal: true }
         Property { name: "memoryReportingEnabled"; type: "bool" }
-        Property { name: "roleNames"; type: "QStringList"; isReadonly: true; isConstant: true }
+        Property { name: "roleNames"; type: "QStringList"; isReadonly: true; isConstant: true; isFinal: true }
         Signal {
             name: "applicationIdChanged"
             Parameter { name: "applicationId"; type: "QString" }
@@ -50,14 +50,14 @@ Module {
         exports: [ "QtApplicationManager.SystemUI/IntentServerHandler 2.0" ]
         exportMetaObjectRevisions: [ 512 ]
         prototype: "AbstractIntentHandler"
-        Property { name: "intentIds"; type: "QStringList" }
-        Property { name: "icon"; type: "QUrl" }
-        Property { name: "names"; type: "QVariantMap" }
-        Property { name: "descriptions"; type: "QVariantMap" }
-        Property { name: "categories"; type: "QStringList" }
-        Property { name: "visibility"; type: "Intent::Visibility" }
-        Property { name: "requiredCapabilities"; type: "QStringList" }
-        Property { name: "parameterMatch"; type: "QVariantMap" }
+        Property { name: "intentIds"; type: "QStringList"; isFinal: true }
+        Property { name: "icon"; type: "QUrl"; isFinal: true }
+        Property { name: "names"; type: "QVariantMap"; isFinal: true }
+        Property { name: "descriptions"; type: "QVariantMap"; isFinal: true }
+        Property { name: "categories"; type: "QStringList"; isFinal: true }
+        Property { name: "visibility"; type: "Intent::Visibility"; isFinal: true }
+        Property { name: "requiredCapabilities"; type: "QStringList"; isFinal: true }
+        Property { name: "parameterMatch"; type: "QVariantMap"; isFinal: true }
         Method {
             name: "setIcon"
             Parameter { name: "icon"; type: "QUrl" }
@@ -92,9 +92,9 @@ Module {
         exports: [ "QtApplicationManager.SystemUI/IntentModel 2.0" ]
         exportMetaObjectRevisions: [ 512 ]
         prototype: "QObject"
-        Property { name: "count"; type: "int"; isReadonly: true }
-        Property { name: "filterFunction"; type: "QJSValue" }
-        Property { name: "sortFunction"; type: "QJSValue" }
+        Property { name: "count"; type: "int"; isReadonly: true; isFinal: true }
+        Property { name: "filterFunction"; type: "QJSValue"; isFinal: true }
+        Property { name: "sortFunction"; type: "QJSValue"; isFinal: true }
         Signal {
             name: "countChanged"
         }
@@ -140,19 +140,19 @@ Module {
         prototype: "QObject"
         isCreatable: false
         Enum { name: "Visibility"; values: [ "Public", "Private" ] }
-        Property { name: "intentId"; type: "QString"; isReadonly: true; isConstant: true }
-        Property { name: "packageId"; type: "QString"; isReadonly: true; isConstant: true }
-        Property { name: "applicationId"; type: "QString"; isReadonly: true; isConstant: true }
-        Property { name: "visibility"; type: "Intent::Visibility"; isReadonly: true; isConstant: true }
-        Property { name: "requiredCapabilities"; type: "QStringList"; isReadonly: true; isConstant: true }
-        Property { name: "parameterMatch"; type: "QVariantMap"; isReadonly: true; isConstant: true }
-        Property { name: "icon"; type: "QUrl"; isReadonly: true; isConstant: true }
-        Property { name: "name"; type: "QString"; isReadonly: true; isConstant: true }
-        Property { name: "names"; type: "QVariantMap"; isReadonly: true; isConstant: true }
-        Property { name: "description"; type: "QString"; isReadonly: true; isConstant: true }
-        Property { name: "descriptions"; type: "QVariantMap"; isReadonly: true; isConstant: true }
-        Property { name: "categories"; type: "QStringList"; isReadonly: true; isConstant: true }
-        Property { name: "handleOnlyWhenRunning"; type: "bool"; revision: 513; isReadonly: true; isConstant: true }
+        Property { name: "intentId"; type: "QString"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "packageId"; type: "QString"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "applicationId"; type: "QString"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "visibility"; type: "Intent::Visibility"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "requiredCapabilities"; type: "QStringList"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "parameterMatch"; type: "QVariantMap"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "icon"; type: "QUrl"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "name"; type: "QString"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "names"; type: "QVariantMap"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "description"; type: "QString"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "descriptions"; type: "QVariantMap"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "categories"; type: "QStringList"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "handleOnlyWhenRunning"; type: "bool"; revision: 513; isReadonly: true; isConstant: true; isFinal: true }
     }
     Component {
         name: "IntentServer"
@@ -160,7 +160,7 @@ Module {
         exportMetaObjectRevisions: [ 512 ]
         prototype: "QAbstractListModel"
         isSingleton: true
-        Property { name: "count"; type: "int"; isReadonly: true }
+        Property { name: "count"; type: "int"; isReadonly: true; isFinal: true }
         Signal {
             name: "intentAdded"
             Parameter { name: "intent"; type: "Intent"; isPointer: true }
@@ -263,10 +263,10 @@ Module {
         exportMetaObjectRevisions: [ 512 ]
         prototype: "QQuickItem"
         defaultProperty: "contentItemData"
-        Property { name: "window"; type: "Window"; isPointer: true }
-        Property { name: "primary"; type: "bool"; isReadonly: true }
+        Property { name: "window"; type: "Window"; isPointer: true; isFinal: true }
+        Property { name: "primary"; type: "bool"; isReadonly: true; isFinal: true }
         Property { name: "objectFollowsItemSize"; type: "bool" }
-        Property { name: "contentItemData"; type: "QQmlListProperty<QObject>"; isReadonly: true }
+        Property { name: "contentItemData"; type: "QQmlListProperty<QObject>"; isReadonly: true; isFinal: true }
         Signal {
             name: "windowChanged"
         }
@@ -290,11 +290,11 @@ Module {
         prototype: "QObject"
         isCreatable: false
         Enum { name: "ContentState"; values: [ "SurfaceWithContent", "SurfaceNoContent", "NoSurface" ] }
-        Property { name: "size"; type: "QSize"; isReadonly: true }
-        Property { name: "contentState"; type: "Window::ContentState"; isReadonly: true }
-        Property { name: "application"; type: "Application"; isPointer: true; isReadonly: true; isConstant: true }
-        Property { name: "popup"; type: "bool"; isReadonly: true; isConstant: true }
-        Property { name: "requestedPopupPosition"; type: "QPoint"; isReadonly: true }
+        Property { name: "size"; type: "QSize"; isReadonly: true; isFinal: true }
+        Property { name: "contentState"; type: "Window::ContentState"; isReadonly: true; isFinal: true }
+        Property { name: "application"; type: "Application"; isPointer: true; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "popup"; type: "bool"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "requestedPopupPosition"; type: "QPoint"; isReadonly: true; isFinal: true }
         Signal {
             name: "sizeChanged"
         }
@@ -341,10 +341,10 @@ Module {
         exportMetaObjectRevisions: [ 512 ]
         prototype: "QAbstractListModel"
         isSingleton: true
-        Property { name: "count"; type: "int"; isReadonly: true }
-        Property { name: "runningOnDesktop"; type: "bool"; isReadonly: true; isConstant: true }
-        Property { name: "slowAnimations"; type: "bool" }
-        Property { name: "allowUnknownUiClients"; type: "bool"; isReadonly: true; isConstant: true }
+        Property { name: "count"; type: "int"; isReadonly: true; isFinal: true }
+        Property { name: "runningOnDesktop"; type: "bool"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "slowAnimations"; type: "bool"; isFinal: true }
+        Property { name: "allowUnknownUiClients"; type: "bool"; isReadonly: true; isConstant: true; isFinal: true }
         Signal {
             name: "countChanged"
         }
@@ -422,9 +422,9 @@ Module {
         exports: [ "QtApplicationManager.SystemUI/ApplicationModel 2.0" ]
         exportMetaObjectRevisions: [ 512 ]
         prototype: "QObject"
-        Property { name: "count"; type: "int"; isReadonly: true }
-        Property { name: "filterFunction"; type: "QJSValue" }
-        Property { name: "sortFunction"; type: "QJSValue" }
+        Property { name: "count"; type: "int"; isReadonly: true; isFinal: true }
+        Property { name: "filterFunction"; type: "QJSValue"; isFinal: true }
+        Property { name: "sortFunction"; type: "QJSValue"; isFinal: true }
         Signal {
             name: "countChanged"
         }
@@ -461,7 +461,7 @@ Module {
         exportMetaObjectRevisions: [ 512 ]
         prototype: "QObject"
         isCreatable: false
-        Property { name: "controlGroup"; type: "QString" }
+        Property { name: "controlGroup"; type: "QString"; isFinal: true }
         Signal {
             name: "ready"
         }
@@ -486,7 +486,7 @@ Module {
         exportMetaObjectRevisions: [ 512 ]
         prototype: "QObject"
         isCreatable: false
-        Property { name: "container"; type: "AbstractContainer"; isPointer: true; isReadonly: true; isConstant: true }
+        Property { name: "container"; type: "AbstractContainer"; isPointer: true; isReadonly: true; isConstant: true; isFinal: true }
         Signal {
             name: "stateChanged"
             Parameter { name: "newState"; type: "Am::RunState" }
@@ -504,32 +504,32 @@ Module {
         prototype: "QObject"
         isCreatable: false
         Enum { name: "State"; values: [ "Installed", "BeingInstalled", "BeingUpdated", "BeingDowngraded", "BeingRemoved" ] }
-        Property { name: "id"; type: "QString"; isReadonly: true; isConstant: true }
-        Property { name: "name"; type: "QString"; isReadonly: true }
-        Property { name: "names"; type: "QVariantMap"; isReadonly: true }
-        Property { name: "description"; type: "QString"; isReadonly: true }
-        Property { name: "descriptions"; type: "QVariantMap"; isReadonly: true }
-        Property { name: "categories"; type: "QStringList"; isReadonly: true }
-        Property { name: "icon"; type: "QUrl"; isReadonly: true }
-        Property { name: "runtimeName"; type: "QString"; isReadonly: true; isConstant: true }
-        Property { name: "runtimeParameters"; type: "QVariantMap"; isReadonly: true; isConstant: true }
-        Property { name: "capabilities"; type: "QStringList"; isReadonly: true; isConstant: true }
-        Property { name: "documentUrl"; type: "QString"; isReadonly: true; isConstant: true }
-        Property { name: "supportedMimeTypes"; type: "QStringList"; isReadonly: true; isConstant: true }
-        Property { name: "applicationProperties"; type: "QVariantMap"; isReadonly: true; isConstant: true }
-        Property { name: "runtime"; type: "AbstractRuntime"; isPointer: true; isReadonly: true }
-        Property { name: "lastExitCode"; type: "int"; isReadonly: true }
-        Property { name: "lastExitStatus"; type: "Am::ExitStatus"; isReadonly: true }
-        Property { name: "codeDir"; type: "QString"; isReadonly: true }
-        Property { name: "runState"; type: "Am::RunState"; isReadonly: true }
-        Property { name: "package"; type: "Package"; isPointer: true; isReadonly: true; isConstant: true }
-        Property { name: "builtIn"; type: "bool"; isReadonly: true; isConstant: true }
-        Property { name: "alias"; type: "bool"; isReadonly: true; isConstant: true }
-        Property { name: "nonAliased"; type: "Application"; isPointer: true; isReadonly: true; isConstant: true }
-        Property { name: "version"; type: "QString"; isReadonly: true; isConstant: true }
-        Property { name: "state"; type: "Application::State"; isReadonly: true }
-        Property { name: "blocked"; type: "bool"; isReadonly: true }
-        Property { name: "supportsApplicationInterface"; type: "bool"; isReadonly: true; isConstant: true }
+        Property { name: "id"; type: "QString"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "name"; type: "QString"; isReadonly: true; isFinal: true }
+        Property { name: "names"; type: "QVariantMap"; isReadonly: true; isFinal: true }
+        Property { name: "description"; type: "QString"; isReadonly: true; isFinal: true }
+        Property { name: "descriptions"; type: "QVariantMap"; isReadonly: true; isFinal: true }
+        Property { name: "categories"; type: "QStringList"; isReadonly: true; isFinal: true }
+        Property { name: "icon"; type: "QUrl"; isReadonly: true; isFinal: true }
+        Property { name: "runtimeName"; type: "QString"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "runtimeParameters"; type: "QVariantMap"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "capabilities"; type: "QStringList"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "documentUrl"; type: "QString"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "supportedMimeTypes"; type: "QStringList"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "applicationProperties"; type: "QVariantMap"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "runtime"; type: "AbstractRuntime"; isPointer: true; isReadonly: true; isFinal: true }
+        Property { name: "lastExitCode"; type: "int"; isReadonly: true; isFinal: true }
+        Property { name: "lastExitStatus"; type: "Am::ExitStatus"; isReadonly: true; isFinal: true }
+        Property { name: "codeDir"; type: "QString"; isReadonly: true; isFinal: true }
+        Property { name: "runState"; type: "Am::RunState"; isReadonly: true; isFinal: true }
+        Property { name: "package"; type: "Package"; isPointer: true; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "builtIn"; type: "bool"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "alias"; type: "bool"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "nonAliased"; type: "Application"; isPointer: true; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "version"; type: "QString"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "state"; type: "Application::State"; isReadonly: true; isFinal: true }
+        Property { name: "blocked"; type: "bool"; isReadonly: true; isFinal: true }
+        Property { name: "supportsApplicationInterface"; type: "bool"; isReadonly: true; isConstant: true; isFinal: true }
         Signal {
             name: "bulkChange"
         }
@@ -591,7 +591,7 @@ Module {
         exportMetaObjectRevisions: [ 512 ]
         prototype: "QAbstractListModel"
         isSingleton: true
-        Property { name: "count"; type: "int"; isReadonly: true }
+        Property { name: "count"; type: "int"; isReadonly: true; isFinal: true }
         Signal {
             name: "countChanged"
         }
@@ -643,15 +643,15 @@ Module {
         exportMetaObjectRevisions: [ 512 ]
         prototype: "QAbstractListModel"
         isSingleton: true
-        Property { name: "count"; type: "int"; isReadonly: true }
-        Property { name: "allowInstallationOfUnsignedPackages"; type: "bool"; isReadonly: true; isConstant: true }
-        Property { name: "developmentMode"; type: "bool"; isReadonly: true; isConstant: true }
-        Property { name: "hardwareId"; type: "QString"; isReadonly: true; isConstant: true }
-        Property { name: "ready"; type: "bool"; isReadonly: true }
-        Property { name: "installationLocation"; type: "QVariantMap"; isReadonly: true; isConstant: true }
-        Property { name: "documentLocation"; type: "QVariantMap"; isReadonly: true; isConstant: true }
-        Property { name: "applicationUserIdSeparation"; type: "bool"; isReadonly: true; isConstant: true }
-        Property { name: "commonApplicationGroupId"; type: "uint"; isReadonly: true; isConstant: true }
+        Property { name: "count"; type: "int"; isReadonly: true; isFinal: true }
+        Property { name: "allowInstallationOfUnsignedPackages"; type: "bool"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "developmentMode"; type: "bool"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "hardwareId"; type: "QString"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "ready"; type: "bool"; isReadonly: true; isFinal: true }
+        Property { name: "installationLocation"; type: "QVariantMap"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "documentLocation"; type: "QVariantMap"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "applicationUserIdSeparation"; type: "bool"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "commonApplicationGroupId"; type: "uint"; isReadonly: true; isConstant: true; isFinal: true }
         Signal {
             name: "readyChanged"
             Parameter { name: "b"; type: "bool" }
@@ -816,10 +816,10 @@ Module {
         exportMetaObjectRevisions: [ 512 ]
         prototype: "QObject"
         isSingleton: true
-        Property { name: "allowInstallationOfUnsignedPackages"; type: "bool"; isReadonly: true; isConstant: true }
-        Property { name: "developmentMode"; type: "bool"; isReadonly: true; isConstant: true }
-        Property { name: "applicationUserIdSeparation"; type: "bool"; isReadonly: true; isConstant: true }
-        Property { name: "commonApplicationGroupId"; type: "uint"; isReadonly: true; isConstant: true }
+        Property { name: "allowInstallationOfUnsignedPackages"; type: "bool"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "developmentMode"; type: "bool"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "applicationUserIdSeparation"; type: "bool"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "commonApplicationGroupId"; type: "uint"; isReadonly: true; isConstant: true; isFinal: true }
         Signal {
             name: "taskStarted"
             Parameter { name: "taskId"; type: "QString" }
@@ -950,14 +950,14 @@ Module {
         exportMetaObjectRevisions: [ 512 ]
         prototype: "QAbstractListModel"
         isSingleton: true
-        Property { name: "count"; type: "int"; isReadonly: true }
-        Property { name: "singleProcess"; type: "bool"; isReadonly: true; isConstant: true }
-        Property { name: "shuttingDown"; type: "bool"; isReadonly: true }
-        Property { name: "securityChecksEnabled"; type: "bool"; isReadonly: true; isConstant: true }
-        Property { name: "dummy"; type: "bool"; isReadonly: true; isConstant: true }
-        Property { name: "windowManagerCompositorReady"; type: "bool"; isReadonly: true }
-        Property { name: "systemProperties"; type: "QVariantMap"; isReadonly: true; isConstant: true }
-        Property { name: "containerSelectionFunction"; type: "QJSValue" }
+        Property { name: "count"; type: "int"; isReadonly: true; isFinal: true }
+        Property { name: "singleProcess"; type: "bool"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "shuttingDown"; type: "bool"; isReadonly: true; isFinal: true }
+        Property { name: "securityChecksEnabled"; type: "bool"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "dummy"; type: "bool"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "windowManagerCompositorReady"; type: "bool"; isReadonly: true; isFinal: true }
+        Property { name: "systemProperties"; type: "QVariantMap"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "containerSelectionFunction"; type: "QJSValue"; isFinal: true }
         Signal {
             name: "applicationRunStateChanged"
             Parameter { name: "id"; type: "QString" }
diff --git a/qmltypes/QtApplicationManager/plugins.qmltypes b/qmltypes/QtApplicationManager/plugins.qmltypes
index c78fd140..81fe4ed9 100644
--- a/qmltypes/QtApplicationManager/plugins.qmltypes
+++ b/qmltypes/QtApplicationManager/plugins.qmltypes
@@ -13,11 +13,11 @@ Module {
         exportMetaObjectRevisions: [ 512 ]
         prototype: "QAbstractListModel"
         defaultProperty: "dataSources"
-        Property { name: "dataSources"; type: "QQmlListProperty<QObject>"; isReadonly: true }
-        Property { name: "count"; type: "int"; isReadonly: true }
-        Property { name: "maximumCount"; type: "int" }
-        Property { name: "interval"; type: "int" }
-        Property { name: "running"; type: "bool" }
+        Property { name: "dataSources"; type: "QQmlListProperty<QObject>"; isReadonly: true; isFinal: true }
+        Property { name: "count"; type: "int"; isReadonly: true; isFinal: true }
+        Property { name: "maximumCount"; type: "int"; isFinal: true }
+        Property { name: "interval"; type: "int"; isFinal: true }
+        Property { name: "running"; type: "bool"; isFinal: true }
         Signal {
             name: "countChanged"
         }
@@ -47,14 +47,14 @@ Module {
         exports: [ "QtApplicationManager/FrameTimer 2.0" ]
         exportMetaObjectRevisions: [ 512 ]
         prototype: "QObject"
-        Property { name: "averageFps"; type: "double"; isReadonly: true }
-        Property { name: "minimumFps"; type: "double"; isReadonly: true }
-        Property { name: "maximumFps"; type: "double"; isReadonly: true }
-        Property { name: "jitterFps"; type: "double"; isReadonly: true }
-        Property { name: "window"; type: "QObject"; isPointer: true }
-        Property { name: "interval"; type: "int" }
-        Property { name: "running"; type: "bool" }
-        Property { name: "roleNames"; type: "QStringList"; isReadonly: true; isConstant: true }
+        Property { name: "averageFps"; type: "double"; isReadonly: true; isFinal: true }
+        Property { name: "minimumFps"; type: "double"; isReadonly: true; isFinal: true }
+        Property { name: "maximumFps"; type: "double"; isReadonly: true; isFinal: true }
+        Property { name: "jitterFps"; type: "double"; isReadonly: true; isFinal: true }
+        Property { name: "window"; type: "QObject"; isPointer: true; isFinal: true }
+        Property { name: "interval"; type: "int"; isFinal: true }
+        Property { name: "running"; type: "bool"; isFinal: true }
+        Property { name: "roleNames"; type: "QStringList"; isReadonly: true; isConstant: true; isFinal: true }
         Signal {
             name: "updated"
         }
@@ -76,9 +76,9 @@ Module {
         exports: [ "QtApplicationManager/IoStatus 2.0" ]
         exportMetaObjectRevisions: [ 512 ]
         prototype: "QObject"
-        Property { name: "deviceNames"; type: "QStringList" }
-        Property { name: "ioLoad"; type: "QVariantMap"; isReadonly: true }
-        Property { name: "roleNames"; type: "QStringList"; isReadonly: true; isConstant: true }
+        Property { name: "deviceNames"; type: "QStringList"; isFinal: true }
+        Property { name: "ioLoad"; type: "QVariantMap"; isReadonly: true; isFinal: true }
+        Property { name: "roleNames"; type: "QStringList"; isReadonly: true; isConstant: true; isFinal: true }
         Signal {
             name: "deviceNamesChanged"
         }
@@ -94,9 +94,9 @@ Module {
         exports: [ "QtApplicationManager/MemoryStatus 2.0" ]
         exportMetaObjectRevisions: [ 512 ]
         prototype: "QObject"
-        Property { name: "totalMemory"; type: "qulonglong"; isReadonly: true; isConstant: true }
-        Property { name: "memoryUsed"; type: "qulonglong"; isReadonly: true }
-        Property { name: "roleNames"; type: "QStringList"; isReadonly: true; isConstant: true }
+        Property { name: "totalMemory"; type: "qulonglong"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "memoryUsed"; type: "qulonglong"; isReadonly: true; isFinal: true }
+        Property { name: "roleNames"; type: "QStringList"; isReadonly: true; isConstant: true; isFinal: true }
         Signal {
             name: "memoryUsedChanged"
         }
@@ -109,8 +109,8 @@ Module {
         exports: [ "QtApplicationManager/GpuStatus 2.0" ]
         exportMetaObjectRevisions: [ 512 ]
         prototype: "QObject"
-        Property { name: "gpuLoad"; type: "double"; isReadonly: true }
-        Property { name: "roleNames"; type: "QStringList"; isReadonly: true; isConstant: true }
+        Property { name: "gpuLoad"; type: "double"; isReadonly: true; isFinal: true }
+        Property { name: "roleNames"; type: "QStringList"; isReadonly: true; isConstant: true; isFinal: true }
         Signal {
             name: "gpuLoadChanged"
         }
@@ -123,9 +123,9 @@ Module {
         exports: [ "QtApplicationManager/CpuStatus 2.0" ]
         exportMetaObjectRevisions: [ 512 ]
         prototype: "QObject"
-        Property { name: "cpuLoad"; type: "double"; isReadonly: true }
-        Property { name: "cpuCores"; type: "int"; isReadonly: true; isConstant: true }
-        Property { name: "roleNames"; type: "QStringList"; isReadonly: true; isConstant: true }
+        Property { name: "cpuLoad"; type: "double"; isReadonly: true; isFinal: true }
+        Property { name: "cpuCores"; type: "int"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "roleNames"; type: "QStringList"; isReadonly: true; isConstant: true; isFinal: true }
         Signal {
             name: "cpuLoadChanged"
         }
@@ -154,16 +154,16 @@ Module {
         prototype: "QObject"
         isCreatable: false
         Enum { name: "Direction"; values: [ "ToSystem", "ToApplication" ] }
-        Property { name: "requestId"; type: "QUuid"; isReadonly: true }
-        Property { name: "direction"; type: "IntentClientRequest::Direction"; isReadonly: true; isConstant: true }
-        Property { name: "intentId"; type: "QString"; isReadonly: true; isConstant: true }
-        Property { name: "applicationId"; type: "QString"; isReadonly: true; isConstant: true }
-        Property { name: "requestingApplicationId"; type: "QString"; isReadonly: true; isConstant: true }
-        Property { name: "parameters"; type: "QVariantMap"; isReadonly: true; isConstant: true }
-        Property { name: "succeeded"; type: "bool"; isReadonly: true }
-        Property { name: "errorMessage"; type: "QString"; isReadonly: true }
-        Property { name: "result"; type: "QVariantMap"; isReadonly: true }
-        Property { name: "broadcast"; type: "bool"; revision: 513; isReadonly: true; isConstant: true }
+        Property { name: "requestId"; type: "QUuid"; isReadonly: true; isFinal: true }
+        Property { name: "direction"; type: "IntentClientRequest::Direction"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "intentId"; type: "QString"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "applicationId"; type: "QString"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "requestingApplicationId"; type: "QString"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "parameters"; type: "QVariantMap"; isReadonly: true; isConstant: true; isFinal: true }
+        Property { name: "succeeded"; type: "bool"; isReadonly: true; isFinal: true }
+        Property { name: "errorMessage"; type: "QString"; isReadonly: true; isFinal: true }
+        Property { name: "result"; type: "QVariantMap"; isReadonly: true; isFinal: true }
+        Property { name: "broadcast"; type: "bool"; revision: 513; isReadonly: true; isConstant: true; isFinal: true }
         Signal {
             name: "requestIdChanged"
         }
@@ -185,7 +185,7 @@ Module {
         exportMetaObjectRevisions: [ 513, 512 ]
         prototype: "QObject"
         isSingleton: true
-        Property { name: "systemUiId"; type: "QString"; revision: 513; isReadonly: true; isConstant: true }
+        Property { name: "systemUiId"; type: "QString"; revision: 513; isReadonly: true; isConstant: true; isFinal: true }
         Method {
             name: "sendIntentRequest"
             type: "IntentClientRequest"; isPointer: true
@@ -212,23 +212,23 @@ Module {
         exportMetaObjectRevisions: [ 512 ]
         prototype: "QObject"
         Enum { name: "Priority"; values: [ "Low", "Normal", "Critical" ] }
-        Property { name: "notificationId"; type: "uint"; isReadonly: true }
-        Property { name: "visible"; type: "bool" }
-        Property { name: "summary"; type: "QString" }
-        Property { name: "body"; type: "QString" }
-        Property { name: "icon"; type: "QUrl" }
-        Property { name: "image"; type: "QUrl" }
-        Property { name: "category"; type: "QString" }
-        Property { name: "priority"; type: "int" }
-        Property { name: "acknowledgeable"; type: "bool" }
-        Property { name: "timeout"; type: "int" }
-        Property { name: "sticky"; type: "bool" }
-        Property { name: "showProgress"; type: "bool" }
-        Property { name: "progress"; type: "double" }
-        Property { name: "actions"; type: "QVariantList" }
-        Property { name: "showActionsAsIcons"; type: "bool" }
-        Property { name: "dismissOnAction"; type: "bool" }
-        Property { name: "extended"; type: "QVariantMap" }
+        Property { name: "notificationId"; type: "uint"; isReadonly: true; isFinal: true }
+        Property { name: "visible"; type: "bool"; isFinal: true }
+        Property { name: "summary"; type: "QString"; isFinal: true }
+        Property { name: "body"; type: "QString"; isFinal: true }
+        Property { name: "icon"; type: "QUrl"; isFinal: true }
+        Property { name: "image"; type: "QUrl"; isFinal: true }
+        Property { name: "category"; type: "QString"; isFinal: true }
+        Property { name: "priority"; type: "int"; isFinal: true }
+        Property { name: "acknowledgeable"; type: "bool"; isFinal: true }
+        Property { name: "timeout"; type: "int"; isFinal: true }
+        Property { name: "sticky"; type: "bool"; isFinal: true }
+        Property { name: "showProgress"; type: "bool"; isFinal: true }
+        Property { name: "progress"; type: "double"; isFinal: true }
+        Property { name: "actions"; type: "QVariantList"; isFinal: true }
+        Property { name: "showActionsAsIcons"; type: "bool"; isFinal: true }
+        Property { name: "dismissOnAction"; type: "bool"; isFinal: true }
+        Property { name: "extended"; type: "QVariantMap"; isFinal: true }
         Signal {
             name: "notificationIdChanged"
             Parameter { name: "notificationId"; type: "uint" }
diff --git a/src/application-lib/applicationinterface.h b/src/application-lib/applicationinterface.h
index dba03bc5..05685d69 100644
--- a/src/application-lib/applicationinterface.h
+++ b/src/application-lib/applicationinterface.h
@@ -16,12 +16,12 @@ class ApplicationInterface : public QObject
 {
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "io.qt.ApplicationManager.ApplicationInterface")
-    Q_PROPERTY(QString applicationId READ applicationId CONSTANT SCRIPTABLE true)
-    Q_PROPERTY(QVariantMap name READ name CONSTANT)
-    Q_PROPERTY(QUrl icon READ icon CONSTANT)
-    Q_PROPERTY(QString version READ version CONSTANT)
-    Q_PROPERTY(QVariantMap systemProperties READ systemProperties CONSTANT SCRIPTABLE true)
-    Q_PROPERTY(QVariantMap applicationProperties READ applicationProperties CONSTANT SCRIPTABLE true)
+    Q_PROPERTY(QString applicationId READ applicationId CONSTANT SCRIPTABLE true FINAL)
+    Q_PROPERTY(QVariantMap name READ name CONSTANT FINAL)
+    Q_PROPERTY(QUrl icon READ icon CONSTANT FINAL)
+    Q_PROPERTY(QString version READ version CONSTANT FINAL)
+    Q_PROPERTY(QVariantMap systemProperties READ systemProperties CONSTANT SCRIPTABLE true FINAL)
+    Q_PROPERTY(QVariantMap applicationProperties READ applicationProperties CONSTANT SCRIPTABLE true FINAL)
 
 public:
     virtual QString applicationId() const = 0;
diff --git a/src/common-lib/startuptimer.h b/src/common-lib/startuptimer.h
index 3ca3d2d0..2cc4a567 100644
--- a/src/common-lib/startuptimer.h
+++ b/src/common-lib/startuptimer.h
@@ -17,9 +17,9 @@ QT_BEGIN_NAMESPACE_AM
 class StartupTimer : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(quint64 timeToFirstFrame READ timeToFirstFrame NOTIFY timeToFirstFrameChanged)
-    Q_PROPERTY(quint64 systemUpTime READ systemUpTime NOTIFY systemUpTimeChanged)
-    Q_PROPERTY(bool automaticReporting READ automaticReporting WRITE setAutomaticReporting NOTIFY automaticReportingChanged)
+    Q_PROPERTY(quint64 timeToFirstFrame READ timeToFirstFrame NOTIFY timeToFirstFrameChanged FINAL)
+    Q_PROPERTY(quint64 systemUpTime READ systemUpTime NOTIFY systemUpTimeChanged FINAL)
+    Q_PROPERTY(bool automaticReporting READ automaticReporting WRITE setAutomaticReporting NOTIFY automaticReportingChanged FINAL)
 
 public:
     static StartupTimer *instance();
diff --git a/src/intent-client-lib/intentclient.h b/src/intent-client-lib/intentclient.h
index a21ed722..db5ed3be 100644
--- a/src/intent-client-lib/intentclient.h
+++ b/src/intent-client-lib/intentclient.h
@@ -27,7 +27,7 @@ class IntentClient : public QObject
 {
     Q_OBJECT
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager/IntentClient 2.1 SINGLETON")
-    Q_PROPERTY(QString systemUiId READ systemUiId CONSTANT REVISION(2, 1))
+    Q_PROPERTY(QString systemUiId READ systemUiId CONSTANT REVISION(2, 1) FINAL)
 
 public:
     ~IntentClient() override;
diff --git a/src/intent-client-lib/intentclientrequest.h b/src/intent-client-lib/intentclientrequest.h
index 079210d7..d2205fdd 100644
--- a/src/intent-client-lib/intentclientrequest.h
+++ b/src/intent-client-lib/intentclientrequest.h
@@ -21,16 +21,16 @@ class IntentClientRequest : public QObject
     Q_OBJECT
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager/IntentRequest 2.1 UNCREATABLE")
 
-    Q_PROPERTY(QUuid requestId READ requestId NOTIFY requestIdChanged)
-    Q_PROPERTY(Direction direction READ direction CONSTANT)
-    Q_PROPERTY(QString intentId READ intentId CONSTANT)
-    Q_PROPERTY(QString applicationId READ applicationId CONSTANT)
-    Q_PROPERTY(QString requestingApplicationId READ requestingApplicationId CONSTANT)
-    Q_PROPERTY(QVariantMap parameters READ parameters CONSTANT)
-    Q_PROPERTY(bool succeeded READ succeeded NOTIFY replyReceived)
-    Q_PROPERTY(QString errorMessage READ errorMessage NOTIFY replyReceived)
-    Q_PROPERTY(QVariantMap result READ result NOTIFY replyReceived)
-    Q_PROPERTY(bool broadcast READ isBroadcast CONSTANT REVISION(2, 1))
+    Q_PROPERTY(QUuid requestId READ requestId NOTIFY requestIdChanged FINAL)
+    Q_PROPERTY(Direction direction READ direction CONSTANT FINAL)
+    Q_PROPERTY(QString intentId READ intentId CONSTANT FINAL)
+    Q_PROPERTY(QString applicationId READ applicationId CONSTANT FINAL)
+    Q_PROPERTY(QString requestingApplicationId READ requestingApplicationId CONSTANT FINAL)
+    Q_PROPERTY(QVariantMap parameters READ parameters CONSTANT FINAL)
+    Q_PROPERTY(bool succeeded READ succeeded NOTIFY replyReceived FINAL)
+    Q_PROPERTY(QString errorMessage READ errorMessage NOTIFY replyReceived FINAL)
+    Q_PROPERTY(QVariantMap result READ result NOTIFY replyReceived FINAL)
+    Q_PROPERTY(bool broadcast READ isBroadcast CONSTANT REVISION(2, 1) FINAL)
 
 public:
     enum class Direction { ToSystem, ToApplication };
diff --git a/src/intent-client-lib/intenthandler.h b/src/intent-client-lib/intenthandler.h
index d4246949..ddef6168 100644
--- a/src/intent-client-lib/intenthandler.h
+++ b/src/intent-client-lib/intenthandler.h
@@ -51,7 +51,7 @@ class IntentHandler : public AbstractIntentHandler
 {
     Q_OBJECT
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager.Application/IntentHandler 2.0")
-    Q_PROPERTY(QStringList intentIds READ intentIds WRITE setIntentIds NOTIFY intentIdsChanged)
+    Q_PROPERTY(QStringList intentIds READ intentIds WRITE setIntentIds NOTIFY intentIdsChanged FINAL)
 
 public:
     IntentHandler(QObject *parent = nullptr);
diff --git a/src/intent-server-lib/intent.h b/src/intent-server-lib/intent.h
index 155d416b..6cb85425 100644
--- a/src/intent-server-lib/intent.h
+++ b/src/intent-server-lib/intent.h
@@ -19,21 +19,21 @@ class Intent : public QObject
     Q_OBJECT
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/IntentObject 2.1 UNCREATABLE")
 
-    Q_PROPERTY(QString intentId READ intentId CONSTANT)
-    Q_PROPERTY(QString packageId READ packageId CONSTANT)
-    Q_PROPERTY(QString applicationId READ applicationId CONSTANT)
-    Q_PROPERTY(QT_PREPEND_NAMESPACE_AM(Intent)::Visibility visibility READ visibility CONSTANT)
-    Q_PROPERTY(QStringList requiredCapabilities READ requiredCapabilities CONSTANT)
-    Q_PROPERTY(QVariantMap parameterMatch READ parameterMatch CONSTANT)
-
-    Q_PROPERTY(QUrl icon READ icon CONSTANT)
-    Q_PROPERTY(QString name READ name CONSTANT)
-    Q_PROPERTY(QVariantMap names READ names CONSTANT)
-    Q_PROPERTY(QString description READ description CONSTANT)
-    Q_PROPERTY(QVariantMap descriptions READ descriptions CONSTANT)
-    Q_PROPERTY(QStringList categories READ categories CONSTANT)
-
-    Q_PROPERTY(bool handleOnlyWhenRunning READ handleOnlyWhenRunning CONSTANT REVISION(2, 1))
+    Q_PROPERTY(QString intentId READ intentId CONSTANT FINAL)
+    Q_PROPERTY(QString packageId READ packageId CONSTANT FINAL)
+    Q_PROPERTY(QString applicationId READ applicationId CONSTANT FINAL)
+    Q_PROPERTY(QT_PREPEND_NAMESPACE_AM(Intent)::Visibility visibility READ visibility CONSTANT FINAL)
+    Q_PROPERTY(QStringList requiredCapabilities READ requiredCapabilities CONSTANT FINAL)
+    Q_PROPERTY(QVariantMap parameterMatch READ parameterMatch CONSTANT FINAL)
+
+    Q_PROPERTY(QUrl icon READ icon CONSTANT FINAL)
+    Q_PROPERTY(QString name READ name CONSTANT FINAL)
+    Q_PROPERTY(QVariantMap names READ names CONSTANT FINAL)
+    Q_PROPERTY(QString description READ description CONSTANT FINAL)
+    Q_PROPERTY(QVariantMap descriptions READ descriptions CONSTANT FINAL)
+    Q_PROPERTY(QStringList categories READ categories CONSTANT FINAL)
+
+    Q_PROPERTY(bool handleOnlyWhenRunning READ handleOnlyWhenRunning CONSTANT REVISION(2, 1) FINAL)
 
 public:
     enum Visibility {
diff --git a/src/intent-server-lib/intentmodel.h b/src/intent-server-lib/intentmodel.h
index d0046c10..99935048 100644
--- a/src/intent-server-lib/intentmodel.h
+++ b/src/intent-server-lib/intentmodel.h
@@ -21,9 +21,9 @@ class IntentModel : public QSortFilterProxyModel
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/IntentModel 2.0")
     Q_CLASSINFO("AM-QmlPrototype", "QObject")
 
-    Q_PROPERTY(int count READ count NOTIFY countChanged)
-    Q_PROPERTY(QJSValue filterFunction READ filterFunction WRITE setFilterFunction NOTIFY filterFunctionChanged)
-    Q_PROPERTY(QJSValue sortFunction READ sortFunction WRITE setSortFunction NOTIFY sortFunctionChanged)
+    Q_PROPERTY(int count READ count NOTIFY countChanged FINAL)
+    Q_PROPERTY(QJSValue filterFunction READ filterFunction WRITE setFilterFunction NOTIFY filterFunctionChanged FINAL)
+    Q_PROPERTY(QJSValue sortFunction READ sortFunction WRITE setSortFunction NOTIFY sortFunctionChanged FINAL)
 
 public:
     IntentModel(QObject *parent = nullptr);
diff --git a/src/intent-server-lib/intentserver.h b/src/intent-server-lib/intentserver.h
index e243663f..654dc8d1 100644
--- a/src/intent-server-lib/intentserver.h
+++ b/src/intent-server-lib/intentserver.h
@@ -26,7 +26,7 @@ class IntentServer : public QAbstractListModel
     Q_OBJECT
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/IntentServer 2.0 SINGLETON")
 
-    Q_PROPERTY(int count READ count NOTIFY countChanged)
+    Q_PROPERTY(int count READ count NOTIFY countChanged FINAL)
 
 public:
     ~IntentServer() override;
diff --git a/src/main-lib/applicationinstaller.h b/src/main-lib/applicationinstaller.h
index 161e0528..15985f35 100644
--- a/src/main-lib/applicationinstaller.h
+++ b/src/main-lib/applicationinstaller.h
@@ -31,11 +31,11 @@ class ApplicationInstaller : public QObject
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ApplicationInstaller 2.0 SINGLETON")
 
     // both are const on purpose - these should never change in a running system
-    Q_PROPERTY(bool allowInstallationOfUnsignedPackages READ allowInstallationOfUnsignedPackages CONSTANT)
-    Q_PROPERTY(bool developmentMode READ developmentMode CONSTANT)
+    Q_PROPERTY(bool allowInstallationOfUnsignedPackages READ allowInstallationOfUnsignedPackages CONSTANT FINAL)
+    Q_PROPERTY(bool developmentMode READ developmentMode CONSTANT FINAL)
 
-    Q_PROPERTY(bool applicationUserIdSeparation READ isApplicationUserIdSeparationEnabled CONSTANT)
-    Q_PROPERTY(uint commonApplicationGroupId READ commonApplicationGroupId CONSTANT)
+    Q_PROPERTY(bool applicationUserIdSeparation READ isApplicationUserIdSeparationEnabled CONSTANT FINAL)
+    Q_PROPERTY(uint commonApplicationGroupId READ commonApplicationGroupId CONSTANT FINAL)
 
 
 public:
diff --git a/src/main-lib/main.h b/src/main-lib/main.h
index a6652383..6b467a39 100644
--- a/src/main-lib/main.h
+++ b/src/main-lib/main.h
@@ -48,7 +48,7 @@ class Configuration;
 class Main : public MainBase, protected SharedMain
 {
     Q_OBJECT
-    Q_PROPERTY(bool singleProcessMode READ isSingleProcessMode CONSTANT)
+    Q_PROPERTY(bool singleProcessMode READ isSingleProcessMode CONSTANT FINAL)
 
 public:
     Main(int &argc, char **argv);
diff --git a/src/manager-lib/abstractcontainer.h b/src/manager-lib/abstractcontainer.h
index d134313e..175239a0 100644
--- a/src/manager-lib/abstractcontainer.h
+++ b/src/manager-lib/abstractcontainer.h
@@ -65,7 +65,7 @@ class AbstractContainer : public QObject
     Q_OBJECT
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/Container 2.0 UNCREATABLE")
 
-    Q_PROPERTY(QString controlGroup READ controlGroup WRITE setControlGroup NOTIFY controlGroupChanged)
+    Q_PROPERTY(QString controlGroup READ controlGroup WRITE setControlGroup NOTIFY controlGroupChanged FINAL)
 
 public:
     virtual ~AbstractContainer();
diff --git a/src/manager-lib/abstractruntime.h b/src/manager-lib/abstractruntime.h
index 9677393a..d743ec1f 100644
--- a/src/manager-lib/abstractruntime.h
+++ b/src/manager-lib/abstractruntime.h
@@ -80,7 +80,7 @@ class AbstractRuntime : public QObject
     Q_OBJECT
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/Runtime 2.0 UNCREATABLE")
 
-    Q_PROPERTY(AbstractContainer *container READ container CONSTANT)
+    Q_PROPERTY(AbstractContainer *container READ container CONSTANT FINAL)
 
 public:
     virtual ~AbstractRuntime();
diff --git a/src/manager-lib/application.h b/src/manager-lib/application.h
index 25a1b8ac..01a41d50 100644
--- a/src/manager-lib/application.h
+++ b/src/manager-lib/application.h
@@ -34,36 +34,36 @@ class Application : public QObject
     Q_OBJECT
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ApplicationObject 2.0 UNCREATABLE")
 
-    Q_PROPERTY(QString id READ id CONSTANT)
-    Q_PROPERTY(QString name READ name NOTIFY bulkChange)
-    Q_PROPERTY(QVariantMap names READ names NOTIFY bulkChange)
-    Q_PROPERTY(QString description READ description NOTIFY bulkChange)
-    Q_PROPERTY(QVariantMap descriptions READ descriptions NOTIFY bulkChange)
-    Q_PROPERTY(QStringList categories READ categories NOTIFY bulkChange)
-    Q_PROPERTY(QUrl icon READ icon NOTIFY bulkChange)
-    Q_PROPERTY(QString runtimeName READ runtimeName CONSTANT)
-    Q_PROPERTY(QVariantMap runtimeParameters READ runtimeParameters CONSTANT)
-    Q_PROPERTY(QStringList capabilities READ capabilities CONSTANT)
-    Q_PROPERTY(QString documentUrl READ documentUrl CONSTANT)
-    Q_PROPERTY(QStringList supportedMimeTypes READ supportedMimeTypes CONSTANT)
-    Q_PROPERTY(QVariantMap applicationProperties READ applicationProperties CONSTANT)
-    Q_PROPERTY(AbstractRuntime *runtime READ currentRuntime NOTIFY runtimeChanged)
-    Q_PROPERTY(int lastExitCode READ lastExitCode NOTIFY lastExitCodeChanged)
-    Q_PROPERTY(QT_PREPEND_NAMESPACE_AM(Am::ExitStatus) lastExitStatus READ lastExitStatus NOTIFY lastExitStatusChanged)
-    Q_PROPERTY(QString codeDir READ codeDir NOTIFY bulkChange)
-    Q_PROPERTY(QT_PREPEND_NAMESPACE_AM(Am::RunState) runState READ runState NOTIFY runStateChanged)
-    Q_PROPERTY(Package *package READ package CONSTANT)
+    Q_PROPERTY(QString id READ id CONSTANT FINAL)
+    Q_PROPERTY(QString name READ name NOTIFY bulkChange FINAL)
+    Q_PROPERTY(QVariantMap names READ names NOTIFY bulkChange FINAL)
+    Q_PROPERTY(QString description READ description NOTIFY bulkChange FINAL)
+    Q_PROPERTY(QVariantMap descriptions READ descriptions NOTIFY bulkChange FINAL)
+    Q_PROPERTY(QStringList categories READ categories NOTIFY bulkChange FINAL)
+    Q_PROPERTY(QUrl icon READ icon NOTIFY bulkChange FINAL)
+    Q_PROPERTY(QString runtimeName READ runtimeName CONSTANT FINAL)
+    Q_PROPERTY(QVariantMap runtimeParameters READ runtimeParameters CONSTANT FINAL)
+    Q_PROPERTY(QStringList capabilities READ capabilities CONSTANT FINAL)
+    Q_PROPERTY(QString documentUrl READ documentUrl CONSTANT FINAL)
+    Q_PROPERTY(QStringList supportedMimeTypes READ supportedMimeTypes CONSTANT FINAL)
+    Q_PROPERTY(QVariantMap applicationProperties READ applicationProperties CONSTANT FINAL)
+    Q_PROPERTY(AbstractRuntime *runtime READ currentRuntime NOTIFY runtimeChanged FINAL)
+    Q_PROPERTY(int lastExitCode READ lastExitCode NOTIFY lastExitCodeChanged FINAL)
+    Q_PROPERTY(QT_PREPEND_NAMESPACE_AM(Am::ExitStatus) lastExitStatus READ lastExitStatus NOTIFY lastExitStatusChanged FINAL)
+    Q_PROPERTY(QString codeDir READ codeDir NOTIFY bulkChange FINAL)
+    Q_PROPERTY(QT_PREPEND_NAMESPACE_AM(Am::RunState) runState READ runState NOTIFY runStateChanged FINAL)
+    Q_PROPERTY(Package *package READ package CONSTANT FINAL)
 
     // legacy, forwarded to Package
-    Q_PROPERTY(bool builtIn READ isBuiltIn CONSTANT)
-    Q_PROPERTY(bool alias READ isAlias CONSTANT)
-    Q_PROPERTY(Application *nonAliased READ nonAliased CONSTANT)
-    Q_PROPERTY(QString version READ version CONSTANT)
-    Q_PROPERTY(State state READ state NOTIFY stateChanged)
-    Q_PROPERTY(bool blocked READ isBlocked NOTIFY blockedChanged)
+    Q_PROPERTY(bool builtIn READ isBuiltIn CONSTANT FINAL)
+    Q_PROPERTY(bool alias READ isAlias CONSTANT FINAL)
+    Q_PROPERTY(Application *nonAliased READ nonAliased CONSTANT FINAL)
+    Q_PROPERTY(QString version READ version CONSTANT FINAL)
+    Q_PROPERTY(State state READ state NOTIFY stateChanged FINAL)
+    Q_PROPERTY(bool blocked READ isBlocked NOTIFY blockedChanged FINAL)
 
     // internal
-    Q_PROPERTY(bool supportsApplicationInterface READ supportsApplicationInterface CONSTANT)
+    Q_PROPERTY(bool supportsApplicationInterface READ supportsApplicationInterface CONSTANT FINAL)
 
 public:
     enum State { // kept for compatibility ... in reality moved to class Package
diff --git a/src/manager-lib/applicationmanager.h b/src/manager-lib/applicationmanager.h
index 5da25569..52fdcd16 100644
--- a/src/manager-lib/applicationmanager.h
+++ b/src/manager-lib/applicationmanager.h
@@ -43,14 +43,14 @@ class ApplicationManager : public QAbstractListModel
     Q_CLASSINFO("D-Bus Interface", "io.qt.ApplicationManager")
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ApplicationManager 2.0 SINGLETON")
 
-    Q_PROPERTY(int count READ count NOTIFY countChanged)
-    Q_PROPERTY(bool singleProcess READ isSingleProcess CONSTANT)
-    Q_PROPERTY(bool shuttingDown READ isShuttingDown NOTIFY shuttingDownChanged SCRIPTABLE false)
-    Q_PROPERTY(bool securityChecksEnabled READ securityChecksEnabled CONSTANT)
-    Q_PROPERTY(bool dummy READ isDummy CONSTANT)  // set to false here and true in the dummydata imports
-    Q_PROPERTY(bool windowManagerCompositorReady READ isWindowManagerCompositorReady NOTIFY windowManagerCompositorReadyChanged)
-    Q_PROPERTY(QVariantMap systemProperties READ systemProperties CONSTANT)
-    Q_PROPERTY(QJSValue containerSelectionFunction READ containerSelectionFunction WRITE setContainerSelectionFunction NOTIFY containerSelectionFunctionChanged)
+    Q_PROPERTY(int count READ count NOTIFY countChanged FINAL)
+    Q_PROPERTY(bool singleProcess READ isSingleProcess CONSTANT FINAL)
+    Q_PROPERTY(bool shuttingDown READ isShuttingDown NOTIFY shuttingDownChanged SCRIPTABLE false FINAL)
+    Q_PROPERTY(bool securityChecksEnabled READ securityChecksEnabled CONSTANT FINAL)
+    Q_PROPERTY(bool dummy READ isDummy CONSTANT FINAL)  // set to false here and true in the dummydata imports
+    Q_PROPERTY(bool windowManagerCompositorReady READ isWindowManagerCompositorReady NOTIFY windowManagerCompositorReadyChanged FINAL)
+    Q_PROPERTY(QVariantMap systemProperties READ systemProperties CONSTANT FINAL)
+    Q_PROPERTY(QJSValue containerSelectionFunction READ containerSelectionFunction WRITE setContainerSelectionFunction NOTIFY containerSelectionFunctionChanged FINAL)
 
 public:
     ~ApplicationManager() override;
diff --git a/src/manager-lib/applicationmodel.h b/src/manager-lib/applicationmodel.h
index ff0a0de3..64c8f27f 100644
--- a/src/manager-lib/applicationmodel.h
+++ b/src/manager-lib/applicationmodel.h
@@ -22,9 +22,9 @@ class ApplicationModel : public QSortFilterProxyModel
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ApplicationModel 2.0")
     Q_CLASSINFO("AM-QmlPrototype", "QObject")
 
-    Q_PROPERTY(int count READ count NOTIFY countChanged)
-    Q_PROPERTY(QJSValue filterFunction READ filterFunction WRITE setFilterFunction NOTIFY filterFunctionChanged)
-    Q_PROPERTY(QJSValue sortFunction READ sortFunction WRITE setSortFunction NOTIFY sortFunctionChanged)
+    Q_PROPERTY(int count READ count NOTIFY countChanged FINAL)
+    Q_PROPERTY(QJSValue filterFunction READ filterFunction WRITE setFilterFunction NOTIFY filterFunctionChanged FINAL)
+    Q_PROPERTY(QJSValue sortFunction READ sortFunction WRITE setSortFunction NOTIFY sortFunctionChanged FINAL)
 
 public:
     ApplicationModel(QObject *parent = nullptr);
diff --git a/src/manager-lib/intentaminterface.h b/src/manager-lib/intentaminterface.h
index 70731ccc..0b5195d6 100644
--- a/src/manager-lib/intentaminterface.h
+++ b/src/manager-lib/intentaminterface.h
@@ -170,14 +170,14 @@ class IntentServerHandler : public AbstractIntentHandler
     // the following properties cannot be changed after construction (hence, also no 'changed' signal)
     // these replace the meta-data that's provided through the info.yaml manifests for client-side
     // handlers
-    Q_PROPERTY(QStringList intentIds READ intentIds WRITE setIntentIds)
-    Q_PROPERTY(QUrl icon READ icon WRITE setIcon)
-    Q_PROPERTY(QVariantMap names READ names WRITE setNames)
-    Q_PROPERTY(QVariantMap descriptions READ descriptions WRITE setDescriptions)
-    Q_PROPERTY(QStringList categories READ categories WRITE setCategories)
-    Q_PROPERTY(QT_PREPEND_NAMESPACE_AM(Intent)::Visibility visibility READ visibility WRITE setVisibility)
-    Q_PROPERTY(QStringList requiredCapabilities READ requiredCapabilities WRITE setRequiredCapabilities)
-    Q_PROPERTY(QVariantMap parameterMatch READ parameterMatch WRITE setParameterMatch)
+    Q_PROPERTY(QStringList intentIds READ intentIds WRITE setIntentIds FINAL)
+    Q_PROPERTY(QUrl icon READ icon WRITE setIcon FINAL)
+    Q_PROPERTY(QVariantMap names READ names WRITE setNames FINAL)
+    Q_PROPERTY(QVariantMap descriptions READ descriptions WRITE setDescriptions FINAL)
+    Q_PROPERTY(QStringList categories READ categories WRITE setCategories FINAL)
+    Q_PROPERTY(QT_PREPEND_NAMESPACE_AM(Intent)::Visibility visibility READ visibility WRITE setVisibility FINAL)
+    Q_PROPERTY(QStringList requiredCapabilities READ requiredCapabilities WRITE setRequiredCapabilities FINAL)
+    Q_PROPERTY(QVariantMap parameterMatch READ parameterMatch WRITE setParameterMatch FINAL)
 
 public:
     IntentServerHandler(QObject *parent = nullptr);
diff --git a/src/manager-lib/notificationmanager.h b/src/manager-lib/notificationmanager.h
index ace0d4aa..040da141 100644
--- a/src/manager-lib/notificationmanager.h
+++ b/src/manager-lib/notificationmanager.h
@@ -22,7 +22,7 @@ class NotificationManager : public QAbstractListModel
     Q_CLASSINFO("D-Bus Interface", "org.freedesktop.Notifications")
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/NotificationManager 2.0 SINGLETON")
 
-    Q_PROPERTY(int count READ count NOTIFY countChanged)
+    Q_PROPERTY(int count READ count NOTIFY countChanged FINAL)
 
 public:
     ~NotificationManager() override;
diff --git a/src/manager-lib/package.h b/src/manager-lib/package.h
index f236e55c..70e928b9 100644
--- a/src/manager-lib/package.h
+++ b/src/manager-lib/package.h
@@ -20,19 +20,19 @@ class Package : public QObject
 {
     Q_OBJECT
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/PackageObject 2.0 UNCREATABLE")
-    Q_PROPERTY(QString id READ id CONSTANT)
-    Q_PROPERTY(bool builtIn READ isBuiltIn NOTIFY bulkChange)
-    Q_PROPERTY(bool builtInHasRemovableUpdate READ builtInHasRemovableUpdate NOTIFY bulkChange)
-    Q_PROPERTY(QUrl icon READ icon NOTIFY bulkChange)
-    Q_PROPERTY(QString version READ version NOTIFY bulkChange)
-    Q_PROPERTY(QString name READ name NOTIFY bulkChange)
-    Q_PROPERTY(QVariantMap names READ names NOTIFY bulkChange)
-    Q_PROPERTY(QString description READ description NOTIFY bulkChange)
-    Q_PROPERTY(QVariantMap descriptions READ descriptions NOTIFY bulkChange)
-    Q_PROPERTY(QStringList categories READ categories NOTIFY bulkChange)
-    Q_PROPERTY(State state READ state NOTIFY stateChanged)
-    Q_PROPERTY(bool blocked READ isBlocked NOTIFY blockedChanged)
-    Q_PROPERTY(QList<QObject *> applications READ applications NOTIFY applicationsChanged)
+    Q_PROPERTY(QString id READ id CONSTANT FINAL)
+    Q_PROPERTY(bool builtIn READ isBuiltIn NOTIFY bulkChange FINAL)
+    Q_PROPERTY(bool builtInHasRemovableUpdate READ builtInHasRemovableUpdate NOTIFY bulkChange FINAL)
+    Q_PROPERTY(QUrl icon READ icon NOTIFY bulkChange FINAL)
+    Q_PROPERTY(QString version READ version NOTIFY bulkChange FINAL)
+    Q_PROPERTY(QString name READ name NOTIFY bulkChange FINAL)
+    Q_PROPERTY(QVariantMap names READ names NOTIFY bulkChange FINAL)
+    Q_PROPERTY(QString description READ description NOTIFY bulkChange FINAL)
+    Q_PROPERTY(QVariantMap descriptions READ descriptions NOTIFY bulkChange FINAL)
+    Q_PROPERTY(QStringList categories READ categories NOTIFY bulkChange FINAL)
+    Q_PROPERTY(State state READ state NOTIFY stateChanged FINAL)
+    Q_PROPERTY(bool blocked READ isBlocked NOTIFY blockedChanged FINAL)
+    Q_PROPERTY(QList<QObject *> applications READ applications NOTIFY applicationsChanged FINAL)
 
 public:
     enum State {
diff --git a/src/manager-lib/packagemanager.h b/src/manager-lib/packagemanager.h
index 6598dd97..d8f9026b 100644
--- a/src/manager-lib/packagemanager.h
+++ b/src/manager-lib/packagemanager.h
@@ -55,18 +55,18 @@ class PackageManager : public QAbstractListModel
     Q_CLASSINFO("D-Bus Interface", "io.qt.PackageManager")
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/PackageManager 2.0 SINGLETON")
 
-    Q_PROPERTY(int count READ count NOTIFY countChanged)
+    Q_PROPERTY(int count READ count NOTIFY countChanged FINAL)
     // these are const on purpose - these should never change in a running system
-    Q_PROPERTY(bool allowInstallationOfUnsignedPackages READ allowInstallationOfUnsignedPackages CONSTANT)
-    Q_PROPERTY(bool developmentMode READ developmentMode CONSTANT)
-    Q_PROPERTY(QString hardwareId READ hardwareId CONSTANT SCRIPTABLE false)
+    Q_PROPERTY(bool allowInstallationOfUnsignedPackages READ allowInstallationOfUnsignedPackages CONSTANT FINAL)
+    Q_PROPERTY(bool developmentMode READ developmentMode CONSTANT FINAL)
+    Q_PROPERTY(QString hardwareId READ hardwareId CONSTANT SCRIPTABLE false FINAL)
 
-    Q_PROPERTY(bool ready READ isReady NOTIFY readyChanged)
-    Q_PROPERTY(QVariantMap installationLocation READ installationLocation CONSTANT)
-    Q_PROPERTY(QVariantMap documentLocation READ documentLocation CONSTANT)
+    Q_PROPERTY(bool ready READ isReady NOTIFY readyChanged FINAL)
+    Q_PROPERTY(QVariantMap installationLocation READ installationLocation CONSTANT FINAL)
+    Q_PROPERTY(QVariantMap documentLocation READ documentLocation CONSTANT FINAL)
 
-    Q_PROPERTY(bool applicationUserIdSeparation READ isApplicationUserIdSeparationEnabled CONSTANT)
-    Q_PROPERTY(uint commonApplicationGroupId READ commonApplicationGroupId CONSTANT)
+    Q_PROPERTY(bool applicationUserIdSeparation READ isApplicationUserIdSeparationEnabled CONSTANT FINAL)
+    Q_PROPERTY(uint commonApplicationGroupId READ commonApplicationGroupId CONSTANT FINAL)
 
 public:
     Q_ENUMS(QT_PREPEND_NAMESPACE_AM(AsynchronousTask::TaskState))
diff --git a/src/manager-lib/processstatus.h b/src/manager-lib/processstatus.h
index 82641cda..ef5ddfd3 100644
--- a/src/manager-lib/processstatus.h
+++ b/src/manager-lib/processstatus.h
@@ -23,15 +23,15 @@ class ProcessStatus : public QObject
 {
     Q_OBJECT
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ProcessStatus 2.0")
-    Q_PROPERTY(QString applicationId READ applicationId WRITE setApplicationId NOTIFY applicationIdChanged)
-    Q_PROPERTY(qint64 processId READ processId NOTIFY processIdChanged)
-    Q_PROPERTY(qreal cpuLoad READ cpuLoad NOTIFY cpuLoadChanged)
-    Q_PROPERTY(QVariantMap memoryVirtual READ memoryVirtual NOTIFY memoryReportingChanged)
-    Q_PROPERTY(QVariantMap memoryRss READ memoryRss NOTIFY memoryReportingChanged)
-    Q_PROPERTY(QVariantMap memoryPss READ memoryPss NOTIFY memoryReportingChanged)
+    Q_PROPERTY(QString applicationId READ applicationId WRITE setApplicationId NOTIFY applicationIdChanged FINAL)
+    Q_PROPERTY(qint64 processId READ processId NOTIFY processIdChanged FINAL)
+    Q_PROPERTY(qreal cpuLoad READ cpuLoad NOTIFY cpuLoadChanged FINAL)
+    Q_PROPERTY(QVariantMap memoryVirtual READ memoryVirtual NOTIFY memoryReportingChanged FINAL)
+    Q_PROPERTY(QVariantMap memoryRss READ memoryRss NOTIFY memoryReportingChanged FINAL)
+    Q_PROPERTY(QVariantMap memoryPss READ memoryPss NOTIFY memoryReportingChanged FINAL)
     Q_PROPERTY(bool memoryReportingEnabled READ isMemoryReportingEnabled WRITE setMemoryReportingEnabled
                                            NOTIFY memoryReportingEnabledChanged)
-    Q_PROPERTY(QStringList roleNames READ roleNames CONSTANT)
+    Q_PROPERTY(QStringList roleNames READ roleNames CONSTANT FINAL)
 public:
     ProcessStatus(QObject *parent = nullptr);
     ~ProcessStatus();
diff --git a/src/manager-lib/qmlinprocessapplicationmanagerwindow.h b/src/manager-lib/qmlinprocessapplicationmanagerwindow.h
index bfe1e4f3..bf16e4c3 100644
--- a/src/manager-lib/qmlinprocessapplicationmanagerwindow.h
+++ b/src/manager-lib/qmlinprocessapplicationmanagerwindow.h
@@ -22,28 +22,28 @@ class QmlInProcessApplicationManagerWindow : public QObject, public QQmlParserSt
 {
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
-    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
-    Q_PROPERTY(QQuickItem* contentItem READ contentItem CONSTANT)
+    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged FINAL)
+    Q_PROPERTY(QQuickItem* contentItem READ contentItem CONSTANT FINAL)
 
     // QWindow properties
-    Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged)
-    //Q_PROPERTY(Qt::WindowModality modality READ modality WRITE setModality NOTIFY modalityChanged)
-    //Q_PROPERTY(Qt::WindowFlags flags READ flags WRITE setFlags)
-    Q_PROPERTY(int x READ x WRITE setX NOTIFY xChanged)
-    Q_PROPERTY(int y READ y WRITE setY NOTIFY yChanged)
-    Q_PROPERTY(int width READ width WRITE setWidth NOTIFY widthChanged)
-    Q_PROPERTY(int height READ height WRITE setHeight NOTIFY heightChanged)
-    Q_PROPERTY(int minimumWidth READ minimumWidth WRITE setMinimumWidth NOTIFY minimumWidthChanged)
-    Q_PROPERTY(int minimumHeight READ minimumHeight WRITE setMinimumHeight NOTIFY minimumHeightChanged)
-    Q_PROPERTY(int maximumWidth READ maximumWidth WRITE setMaximumWidth NOTIFY maximumWidthChanged)
-    Q_PROPERTY(int maximumHeight READ maximumHeight WRITE setMaximumHeight NOTIFY maximumHeightChanged)
-    Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
-    Q_PROPERTY(bool active READ isActive NOTIFY activeChanged)
-    //Q_PROPERTY(Visibility visibility READ visibility WRITE setVisibility NOTIFY visibilityChanged)
-    //Q_PROPERTY(Qt::ScreenOrientation contentOrientation READ contentOrientation WRITE reportContentOrientationChange NOTIFY contentOrientationChanged)
-    Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged)
-
-    Q_PROPERTY(QQmlListProperty<QObject> data READ data NOTIFY dataChanged)
+    Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged FINAL)
+    //Q_PROPERTY(Qt::WindowModality modality READ modality WRITE setModality NOTIFY modalityChanged FINAL)
+    //Q_PROPERTY(Qt::WindowFlags flags READ flags WRITE setFlags FINAL)
+    Q_PROPERTY(int x READ x WRITE setX NOTIFY xChanged FINAL)
+    Q_PROPERTY(int y READ y WRITE setY NOTIFY yChanged FINAL)
+    Q_PROPERTY(int width READ width WRITE setWidth NOTIFY widthChanged FINAL)
+    Q_PROPERTY(int height READ height WRITE setHeight NOTIFY heightChanged FINAL)
+    Q_PROPERTY(int minimumWidth READ minimumWidth WRITE setMinimumWidth NOTIFY minimumWidthChanged FINAL)
+    Q_PROPERTY(int minimumHeight READ minimumHeight WRITE setMinimumHeight NOTIFY minimumHeightChanged FINAL)
+    Q_PROPERTY(int maximumWidth READ maximumWidth WRITE setMaximumWidth NOTIFY maximumWidthChanged FINAL)
+    Q_PROPERTY(int maximumHeight READ maximumHeight WRITE setMaximumHeight NOTIFY maximumHeightChanged FINAL)
+    Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged FINAL)
+    Q_PROPERTY(bool active READ isActive NOTIFY activeChanged FINAL)
+    //Q_PROPERTY(Visibility visibility READ visibility WRITE setVisibility NOTIFY visibilityChanged FINAL)
+    //Q_PROPERTY(Qt::ScreenOrientation contentOrientation READ contentOrientation WRITE reportContentOrientationChange NOTIFY contentOrientationChanged FINAL)
+    Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged FINAL)
+
+    Q_PROPERTY(QQmlListProperty<QObject> data READ data NOTIFY dataChanged FINAL)
 
     Q_CLASSINFO("DefaultProperty", "data")
 
diff --git a/src/notification-lib/notification.h b/src/notification-lib/notification.h
index 46685955..0f3f3c89 100644
--- a/src/notification-lib/notification.h
+++ b/src/notification-lib/notification.h
@@ -19,24 +19,24 @@ class Notification : public QObject, public QQmlParserStatus
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager/Notification 2.0")
     Q_INTERFACES(QQmlParserStatus)
 
-    Q_PROPERTY(uint notificationId READ notificationId NOTIFY notificationIdChanged)
-    Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
-
-    Q_PROPERTY(QString summary READ summary WRITE setSummary NOTIFY summaryChanged)
-    Q_PROPERTY(QString body READ body WRITE setBody NOTIFY bodyChanged)
-    Q_PROPERTY(QUrl icon READ icon WRITE setIcon NOTIFY iconChanged)
-    Q_PROPERTY(QUrl image READ image WRITE setImage NOTIFY imageChanged)
-    Q_PROPERTY(QString category READ category WRITE setCategory NOTIFY categoryChanged)
-    Q_PROPERTY(int priority READ priority WRITE setPriority NOTIFY priorityChanged)
-    Q_PROPERTY(bool acknowledgeable READ isAcknowledgeable WRITE setAcknowledgeable NOTIFY acknowledgeableChanged)
-    Q_PROPERTY(int timeout READ timeout WRITE setTimeout NOTIFY timeoutChanged)
-    Q_PROPERTY(bool sticky READ isSticky WRITE setSticky NOTIFY stickyChanged)
-    Q_PROPERTY(bool showProgress READ isShowingProgress WRITE setShowProgress NOTIFY showProgressChanged)
-    Q_PROPERTY(qreal progress READ progress WRITE setProgress NOTIFY progressChanged)
-    Q_PROPERTY(QVariantList actions READ actions WRITE setActions NOTIFY actionsChanged)
-    Q_PROPERTY(bool showActionsAsIcons READ showActionsAsIcons WRITE setShowActionsAsIcons NOTIFY showActionsAsIconsChanged)
-    Q_PROPERTY(bool dismissOnAction READ dismissOnAction WRITE setDismissOnAction NOTIFY dismissOnActionChanged)
-    Q_PROPERTY(QVariantMap extended READ extended WRITE setExtended NOTIFY extendedChanged)
+    Q_PROPERTY(uint notificationId READ notificationId NOTIFY notificationIdChanged FINAL)
+    Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged FINAL)
+
+    Q_PROPERTY(QString summary READ summary WRITE setSummary NOTIFY summaryChanged FINAL)
+    Q_PROPERTY(QString body READ body WRITE setBody NOTIFY bodyChanged FINAL)
+    Q_PROPERTY(QUrl icon READ icon WRITE setIcon NOTIFY iconChanged FINAL)
+    Q_PROPERTY(QUrl image READ image WRITE setImage NOTIFY imageChanged FINAL)
+    Q_PROPERTY(QString category READ category WRITE setCategory NOTIFY categoryChanged FINAL)
+    Q_PROPERTY(int priority READ priority WRITE setPriority NOTIFY priorityChanged FINAL)
+    Q_PROPERTY(bool acknowledgeable READ isAcknowledgeable WRITE setAcknowledgeable NOTIFY acknowledgeableChanged FINAL)
+    Q_PROPERTY(int timeout READ timeout WRITE setTimeout NOTIFY timeoutChanged FINAL)
+    Q_PROPERTY(bool sticky READ isSticky WRITE setSticky NOTIFY stickyChanged FINAL)
+    Q_PROPERTY(bool showProgress READ isShowingProgress WRITE setShowProgress NOTIFY showProgressChanged FINAL)
+    Q_PROPERTY(qreal progress READ progress WRITE setProgress NOTIFY progressChanged FINAL)
+    Q_PROPERTY(QVariantList actions READ actions WRITE setActions NOTIFY actionsChanged FINAL)
+    Q_PROPERTY(bool showActionsAsIcons READ showActionsAsIcons WRITE setShowActionsAsIcons NOTIFY showActionsAsIconsChanged FINAL)
+    Q_PROPERTY(bool dismissOnAction READ dismissOnAction WRITE setDismissOnAction NOTIFY dismissOnActionChanged FINAL)
+    Q_PROPERTY(QVariantMap extended READ extended WRITE setExtended NOTIFY extendedChanged FINAL)
 
 public:
     enum Priority { Low, Normal, Critical };
diff --git a/src/shared-main-lib/cpustatus.h b/src/shared-main-lib/cpustatus.h
index 82c8a601..5ff33ad6 100644
--- a/src/shared-main-lib/cpustatus.h
+++ b/src/shared-main-lib/cpustatus.h
@@ -19,10 +19,10 @@ class CpuStatus : public QObject
 {
     Q_OBJECT
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager/CpuStatus 2.0")
-    Q_PROPERTY(qreal cpuLoad READ cpuLoad NOTIFY cpuLoadChanged)
-    Q_PROPERTY(int cpuCores READ cpuCores CONSTANT)
+    Q_PROPERTY(qreal cpuLoad READ cpuLoad NOTIFY cpuLoadChanged FINAL)
+    Q_PROPERTY(int cpuCores READ cpuCores CONSTANT FINAL)
 
-    Q_PROPERTY(QStringList roleNames READ roleNames CONSTANT)
+    Q_PROPERTY(QStringList roleNames READ roleNames CONSTANT FINAL)
 
 public:
     CpuStatus(QObject *parent = nullptr);
diff --git a/src/shared-main-lib/frametimer.h b/src/shared-main-lib/frametimer.h
index 41e7988b..9d9eeb57 100644
--- a/src/shared-main-lib/frametimer.h
+++ b/src/shared-main-lib/frametimer.h
@@ -20,17 +20,17 @@ class FrameTimer : public QObject
     Q_OBJECT
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager/FrameTimer 2.0")
 
-    Q_PROPERTY(qreal averageFps READ averageFps NOTIFY updated)
-    Q_PROPERTY(qreal minimumFps READ minimumFps NOTIFY updated)
-    Q_PROPERTY(qreal maximumFps READ maximumFps NOTIFY updated)
-    Q_PROPERTY(qreal jitterFps READ jitterFps NOTIFY updated)
+    Q_PROPERTY(qreal averageFps READ averageFps NOTIFY updated FINAL)
+    Q_PROPERTY(qreal minimumFps READ minimumFps NOTIFY updated FINAL)
+    Q_PROPERTY(qreal maximumFps READ maximumFps NOTIFY updated FINAL)
+    Q_PROPERTY(qreal jitterFps READ jitterFps NOTIFY updated FINAL)
 
-    Q_PROPERTY(QObject* window READ window WRITE setWindow NOTIFY windowChanged)
+    Q_PROPERTY(QObject* window READ window WRITE setWindow NOTIFY windowChanged FINAL)
 
-    Q_PROPERTY(int interval READ interval WRITE setInterval NOTIFY intervalChanged)
-    Q_PROPERTY(bool running READ running WRITE setRunning NOTIFY runningChanged)
+    Q_PROPERTY(int interval READ interval WRITE setInterval NOTIFY intervalChanged FINAL)
+    Q_PROPERTY(bool running READ running WRITE setRunning NOTIFY runningChanged FINAL)
 
-    Q_PROPERTY(QStringList roleNames READ roleNames CONSTANT)
+    Q_PROPERTY(QStringList roleNames READ roleNames CONSTANT FINAL)
 
 public:
     FrameTimer(QObject *parent = nullptr);
diff --git a/src/shared-main-lib/gpustatus.h b/src/shared-main-lib/gpustatus.h
index 5ed0d1e3..ad816578 100644
--- a/src/shared-main-lib/gpustatus.h
+++ b/src/shared-main-lib/gpustatus.h
@@ -18,9 +18,9 @@ class GpuStatus : public QObject
 {
     Q_OBJECT
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager/GpuStatus 2.0")
-    Q_PROPERTY(qreal gpuLoad READ gpuLoad NOTIFY gpuLoadChanged)
+    Q_PROPERTY(qreal gpuLoad READ gpuLoad NOTIFY gpuLoadChanged FINAL)
 
-    Q_PROPERTY(QStringList roleNames READ roleNames CONSTANT)
+    Q_PROPERTY(QStringList roleNames READ roleNames CONSTANT FINAL)
 
 public:
     GpuStatus(QObject *parent = nullptr);
diff --git a/src/shared-main-lib/iostatus.h b/src/shared-main-lib/iostatus.h
index 05d8a0c3..3011977a 100644
--- a/src/shared-main-lib/iostatus.h
+++ b/src/shared-main-lib/iostatus.h
@@ -20,10 +20,10 @@ class IoStatus : public QObject
 {
     Q_OBJECT
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager/IoStatus 2.0")
-    Q_PROPERTY(QStringList deviceNames READ deviceNames WRITE setDeviceNames NOTIFY deviceNamesChanged)
-    Q_PROPERTY(QVariantMap ioLoad READ ioLoad NOTIFY ioLoadChanged)
+    Q_PROPERTY(QStringList deviceNames READ deviceNames WRITE setDeviceNames NOTIFY deviceNamesChanged FINAL)
+    Q_PROPERTY(QVariantMap ioLoad READ ioLoad NOTIFY ioLoadChanged FINAL)
 
-    Q_PROPERTY(QStringList roleNames READ roleNames CONSTANT)
+    Q_PROPERTY(QStringList roleNames READ roleNames CONSTANT FINAL)
 
 public:
     IoStatus(QObject *parent = nullptr);
diff --git a/src/shared-main-lib/memorystatus.h b/src/shared-main-lib/memorystatus.h
index 952fb0f2..8e509557 100644
--- a/src/shared-main-lib/memorystatus.h
+++ b/src/shared-main-lib/memorystatus.h
@@ -18,10 +18,10 @@ class MemoryStatus : public QObject
 {
     Q_OBJECT
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager/MemoryStatus 2.0")
-    Q_PROPERTY(quint64 totalMemory READ totalMemory CONSTANT)
-    Q_PROPERTY(quint64 memoryUsed READ memoryUsed NOTIFY memoryUsedChanged)
+    Q_PROPERTY(quint64 totalMemory READ totalMemory CONSTANT FINAL)
+    Q_PROPERTY(quint64 memoryUsed READ memoryUsed NOTIFY memoryUsedChanged FINAL)
 
-    Q_PROPERTY(QStringList roleNames READ roleNames CONSTANT)
+    Q_PROPERTY(QStringList roleNames READ roleNames CONSTANT FINAL)
 
 public:
     MemoryStatus(QObject *parent = nullptr);
diff --git a/src/shared-main-lib/monitormodel.h b/src/shared-main-lib/monitormodel.h
index 608aa44e..bbe50608 100644
--- a/src/shared-main-lib/monitormodel.h
+++ b/src/shared-main-lib/monitormodel.h
@@ -19,14 +19,14 @@ class MonitorModel : public QAbstractListModel
     Q_OBJECT
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager/MonitorModel 2.0")
 
-    Q_PROPERTY(QQmlListProperty<QObject> dataSources READ dataSources NOTIFY dataSourcesChanged)
+    Q_PROPERTY(QQmlListProperty<QObject> dataSources READ dataSources NOTIFY dataSourcesChanged FINAL)
     Q_CLASSINFO("DefaultProperty", "dataSources")
 
-    Q_PROPERTY(int count READ count NOTIFY countChanged)
-    Q_PROPERTY(int maximumCount READ maximumCount WRITE setMaximumCount  NOTIFY maximumCountChanged)
+    Q_PROPERTY(int count READ count NOTIFY countChanged FINAL)
+    Q_PROPERTY(int maximumCount READ maximumCount WRITE setMaximumCount  NOTIFY maximumCountChanged FINAL)
 
-    Q_PROPERTY(int interval READ interval WRITE setInterval NOTIFY intervalChanged)
-    Q_PROPERTY(bool running READ running WRITE setRunning NOTIFY runningChanged)
+    Q_PROPERTY(int interval READ interval WRITE setInterval NOTIFY intervalChanged FINAL)
+    Q_PROPERTY(bool running READ running WRITE setRunning NOTIFY runningChanged FINAL)
 
 public:
     MonitorModel(QObject *parent = nullptr);
diff --git a/src/tools/dumpqmltypes/dumpqmltypes.cpp b/src/tools/dumpqmltypes/dumpqmltypes.cpp
index 6fc6c4a1..f9e92b27 100644
--- a/src/tools/dumpqmltypes/dumpqmltypes.cpp
+++ b/src/tools/dumpqmltypes/dumpqmltypes.cpp
@@ -248,6 +248,8 @@ static QByteArray qmlTypeForMetaObect(const QMetaObject *mo, int level, bool ind
             str += "; isReadonly: true";
         if (p.isConstant())
             str += "; isConstant: true";
+        if (p.isFinal())
+            str += "; isFinal: true";
         str = str + " }\n";
     }
 
diff --git a/src/tools/testrunner/amtest.h b/src/tools/testrunner/amtest.h
index 5ca9f426..c767942c 100644
--- a/src/tools/testrunner/amtest.h
+++ b/src/tools/testrunner/amtest.h
@@ -13,7 +13,7 @@ QT_BEGIN_NAMESPACE_AM
 class AmTest : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(int timeoutFactor READ timeoutFactor CONSTANT)
+    Q_PROPERTY(int timeoutFactor READ timeoutFactor CONSTANT FINAL)
 
     AmTest();
 
diff --git a/src/window-lib/waylandwindow.h b/src/window-lib/waylandwindow.h
index 6969b799..e0834aed 100644
--- a/src/window-lib/waylandwindow.h
+++ b/src/window-lib/waylandwindow.h
@@ -20,8 +20,8 @@ class WindowSurface;
 class WaylandWindow : public Window
 {
     Q_OBJECT
-    Q_PROPERTY(QWaylandQuickSurface *waylandSurface READ waylandSurface NOTIFY waylandSurfaceChanged)
-    Q_PROPERTY(QWaylandXdgSurface *waylandXdgSurface READ waylandXdgSurface NOTIFY waylandXdgSurfaceChanged)
+    Q_PROPERTY(QWaylandQuickSurface *waylandSurface READ waylandSurface NOTIFY waylandSurfaceChanged FINAL)
+    Q_PROPERTY(QWaylandXdgSurface *waylandXdgSurface READ waylandXdgSurface NOTIFY waylandXdgSurfaceChanged FINAL)
 
 public:
     WaylandWindow(Application *app, WindowSurface *surface);
diff --git a/src/window-lib/window.h b/src/window-lib/window.h
index bb954e8e..703cc02c 100644
--- a/src/window-lib/window.h
+++ b/src/window-lib/window.h
@@ -27,11 +27,11 @@ class Window : public QObject
     Q_OBJECT
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/WindowObject 2.0 UNCREATABLE")
 
-    Q_PROPERTY(QSize size READ size NOTIFY sizeChanged)
-    Q_PROPERTY(ContentState contentState READ contentState NOTIFY contentStateChanged)
-    Q_PROPERTY(Application* application READ application CONSTANT)
-    Q_PROPERTY(bool popup READ isPopup CONSTANT)
-    Q_PROPERTY(QPoint requestedPopupPosition READ requestedPopupPosition NOTIFY requestedPopupPositionChanged)
+    Q_PROPERTY(QSize size READ size NOTIFY sizeChanged FINAL)
+    Q_PROPERTY(ContentState contentState READ contentState NOTIFY contentStateChanged FINAL)
+    Q_PROPERTY(Application* application READ application CONSTANT FINAL)
+    Q_PROPERTY(bool popup READ isPopup CONSTANT FINAL)
+    Q_PROPERTY(QPoint requestedPopupPosition READ requestedPopupPosition NOTIFY requestedPopupPositionChanged FINAL)
 
 public:
 
diff --git a/src/window-lib/windowitem.h b/src/window-lib/windowitem.h
index a23b3b5e..ee072adf 100644
--- a/src/window-lib/windowitem.h
+++ b/src/window-lib/windowitem.h
@@ -23,13 +23,13 @@ class WindowItem : public QQuickItem
     Q_OBJECT
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/WindowItem 2.0")
 
-    Q_PROPERTY(Window* window READ window WRITE setWindow NOTIFY windowChanged)
-    Q_PROPERTY(bool primary READ primary NOTIFY primaryChanged)
+    Q_PROPERTY(Window* window READ window WRITE setWindow NOTIFY windowChanged FINAL)
+    Q_PROPERTY(bool primary READ primary NOTIFY primaryChanged FINAL)
     Q_PROPERTY(bool objectFollowsItemSize READ objectFollowsItemSize
                                           WRITE setObjectFollowsItemSize
                                           NOTIFY objectFollowsItemSizeChanged)
 
-    Q_PROPERTY(QQmlListProperty<QObject> contentItemData READ contentItemData NOTIFY contentItemDataChanged)
+    Q_PROPERTY(QQmlListProperty<QObject> contentItemData READ contentItemData NOTIFY contentItemDataChanged FINAL)
     Q_CLASSINFO("DefaultProperty", "contentItemData")
 
 public:
diff --git a/src/window-lib/windowmanager.h b/src/window-lib/windowmanager.h
index 1e85242d..80b9336d 100644
--- a/src/window-lib/windowmanager.h
+++ b/src/window-lib/windowmanager.h
@@ -55,10 +55,10 @@ class WindowManager : public QAbstractListModel
     Q_CLASSINFO("D-Bus Interface", "io.qt.WindowManager")
     Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/WindowManager 2.0 SINGLETON")
 
-    Q_PROPERTY(int count READ count NOTIFY countChanged)
-    Q_PROPERTY(bool runningOnDesktop READ isRunningOnDesktop CONSTANT)
-    Q_PROPERTY(bool slowAnimations READ slowAnimations WRITE setSlowAnimations NOTIFY slowAnimationsChanged)
-    Q_PROPERTY(bool allowUnknownUiClients READ allowUnknownUiClients CONSTANT)
+    Q_PROPERTY(int count READ count NOTIFY countChanged FINAL)
+    Q_PROPERTY(bool runningOnDesktop READ isRunningOnDesktop CONSTANT FINAL)
+    Q_PROPERTY(bool slowAnimations READ slowAnimations WRITE setSlowAnimations NOTIFY slowAnimationsChanged FINAL)
+    Q_PROPERTY(bool allowUnknownUiClients READ allowUnknownUiClients CONSTANT FINAL)
 
 public:
     ~WindowManager() override;
author	Robert Griebl <robert.griebl@qt.io>	2023-06-22 02:03:17 +0200
committer	Robert Griebl <robert.griebl@qt.io>	2023-06-22 15:10:36 +0200
commit	aca5b6f7b3212c9f9a7860c12b7f3f4b6539ff42 (patch)
tree	d37ad19ecc2c4f459ef63541701ed06f27fb6d22
parent	691f76d35fea7a9437f3a94bc08e0301db63e511 (diff)