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>

4 files changed, 14 insertions, 14 deletions

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;