diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2022-01-07 15:45:07 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-01-13 11:27:21 +0000 |
| commit | 5c81f429844a8b4f002cb298398e17381768df48 (patch) | |
| tree | a207bbe1b14bedf4e45759b13e153ad83524abdc | |
| parent | b533faf548ff16af16ecc29765608e6b6312acaa (diff) | |
Designer: Mark methods as override
Fixes warnings with gcc on Windows:
qdesigneraxwidget.h:70:11: error: 'virtual QSize QDesignerAxWidget::sizeHint() const' can be marked override [-Werror=suggest-override]
Change-Id: Ie2cb37d3afba14cd08edff090175495599219398
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit c3c5b6f34fcc4a457c6b29373632705219a32763)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/designer/src/plugins/activeqt/qdesigneraxwidget.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/designer/src/plugins/activeqt/qdesigneraxwidget.h b/src/designer/src/plugins/activeqt/qdesigneraxwidget.h index 8f74bfaea..51c37df07 100644 --- a/src/designer/src/plugins/activeqt/qdesigneraxwidget.h +++ b/src/designer/src/plugins/activeqt/qdesigneraxwidget.h @@ -67,8 +67,8 @@ public: void setControl(const QString &clsid); QString control() const; - QSize sizeHint() const; - QSize minimumSizeHint() const; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; bool loaded() { return (m_axobject != 0); } @@ -80,7 +80,7 @@ public: void setDrawFlags(unsigned f) { m_drawFlags = f; } protected: - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; QAxWidget *axobject() const { return m_axobject; } private: |