diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-07-22 20:29:24 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-05 07:55:46 +0000 |
| commit | c02d23360186b43fcd570e1c7fc666cb14b487d6 (patch) | |
| tree | 59af65184cbba83773c54469d1bd068147fa82bb /src/imports/platform/widgets | |
| parent | e9855d8ac8afed5371330f4f83f7b7dd51d9026f (diff) | |
Platform: fix inconsistent missing override warnings
Change-Id: Ib3111bf9378d7910b99658a1747f6407ff69a943
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/platform/widgets')
| -rw-r--r-- | src/imports/platform/widgets/qwidgetplatformmenu_p.h | 6 | ||||
| -rw-r--r-- | src/imports/platform/widgets/qwidgetplatformsystemtrayicon_p.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/platform/widgets/qwidgetplatformmenu_p.h b/src/imports/platform/widgets/qwidgetplatformmenu_p.h index d53a7e96..56ea7a45 100644 --- a/src/imports/platform/widgets/qwidgetplatformmenu_p.h +++ b/src/imports/platform/widgets/qwidgetplatformmenu_p.h @@ -81,14 +81,14 @@ public: void setFont(const QFont &font) override; void setMenuType(MenuType type) override; - void showPopup(const QWindow *window, const QRect &targetRect, const QPlatformMenuItem *item); + void showPopup(const QWindow *window, const QRect &targetRect, const QPlatformMenuItem *item) override; void dismiss() override; QPlatformMenuItem *menuItemAt(int position) const override; QPlatformMenuItem *menuItemForTag(quintptr tag) const override; - QPlatformMenuItem *createMenuItem() const; - QPlatformMenu *createSubMenu() const; + QPlatformMenuItem *createMenuItem() const override; + QPlatformMenu *createSubMenu() const override; private: QScopedPointer<QMenu> m_menu; diff --git a/src/imports/platform/widgets/qwidgetplatformsystemtrayicon_p.h b/src/imports/platform/widgets/qwidgetplatformsystemtrayicon_p.h index 905d8b82..f48430a4 100644 --- a/src/imports/platform/widgets/qwidgetplatformsystemtrayicon_p.h +++ b/src/imports/platform/widgets/qwidgetplatformsystemtrayicon_p.h @@ -74,7 +74,7 @@ public: bool isSystemTrayAvailable() const override; bool supportsMessages() const override; - QPlatformMenu *createMenu() const; + QPlatformMenu *createMenu() const override; private: QScopedPointer<QSystemTrayIcon> m_systray; |