diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2021-06-03 11:15:18 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2021-06-03 15:27:34 +0200 |
| commit | f5258c36824faed557ff847be51156d4ef229514 (patch) | |
| tree | 489a408788585d4966fd87268159eace17d8022c /src/quicktemplates2/qquickpage_p.h | |
| parent | 6c12a416b7b7cd806ea37f8cc65a85ba4dd403b8 (diff) | |
Fix FINAL warning
An example of the warning:
"Final member contentWidth is overridden in class QQuickPage.
The override won't be used."
- Remove FINAL from base class properties that are overridden
by subclasses where it's not clear if it would be safe to
not override those properties
- Everywhere else, stop redeclaring properties in subclasses.
This will result in e.g. MenuBar not having a contentWidth
property if the QML is importing version 2.4, but as we're
now long past that version, it should be fine.
This fixes some auto tests that were failing after
ba2928c787cf0988a7f6a7d424faea96ff707846.
[ChangeLog][Important Behavior Changes] QML code that imported
version 2.4 or earlier will no longer be able to access contentWidth
and contentHeight in types derived from Container (i.e. MenuBar, etc.).
Fixes: QTBUG-94180
Change-Id: I3cdb79de8a1b54ab0c78ad661c432c47d5d1dfc6
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickpage_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickpage_p.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquickpage_p.h b/src/quicktemplates2/qquickpage_p.h index 3278900d..0a65f67f 100644 --- a/src/quicktemplates2/qquickpage_p.h +++ b/src/quicktemplates2/qquickpage_p.h @@ -61,9 +61,6 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPage : public QQuickPane Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged FINAL) Q_PROPERTY(QQuickItem *header READ header WRITE setHeader NOTIFY headerChanged FINAL) Q_PROPERTY(QQuickItem *footer READ footer WRITE setFooter NOTIFY footerChanged FINAL) - // 2.1 (Qt 5.8) - Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth NOTIFY contentWidthChanged FINAL REVISION(2, 1)) - Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight NOTIFY contentHeightChanged FINAL REVISION(2, 1)) // 2.5 (Qt 5.12) Q_PROPERTY(qreal implicitHeaderWidth READ implicitHeaderWidth NOTIFY implicitHeaderWidthChanged FINAL REVISION(2, 5)) Q_PROPERTY(qreal implicitHeaderHeight READ implicitHeaderHeight NOTIFY implicitHeaderHeightChanged FINAL REVISION(2, 5)) |