diff options
| author | Sérgio Martins <sergio.martins@kdab.com> | 2015-01-30 18:20:08 +0000 |
|---|---|---|
| committer | Sérgio Martins <sergio.martins@kdab.com> | 2015-02-03 22:52:14 +0000 |
| commit | ad2ea165501c23cbd85c4ddb155f2d7ea8fc85b8 (patch) | |
| tree | a6f78e3f3448418d8cac1dc6b77e9d44d8333201 /src/gui/kernel/qwindow.h | |
| parent | b2595bd015ef17a38af4fec301317b2621cfb5bb (diff) | |
Fix 1700 override warnings [-Winconsistent-missing-override]
Classes should either use or not use override, otherwise it hurts
code readability.
Some inline keywords were removed because of an error with MSVC2010:
error C2216: 'override' cannot be used with 'inline'
Change-Id: I7276d5525a92281bd0d743beb11d0dc73441443b
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/gui/kernel/qwindow.h')
| -rw-r--r-- | src/gui/kernel/qwindow.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h index 1a43ac6fc2..1a6e39cd19 100644 --- a/src/gui/kernel/qwindow.h +++ b/src/gui/kernel/qwindow.h @@ -216,7 +216,7 @@ public: inline int x() const { return geometry().x(); } inline int y() const { return geometry().y(); } - inline QSize size() const { return geometry().size(); } + QSize size() const Q_DECL_OVERRIDE { return geometry().size(); } inline QPoint position() const { return geometry().topLeft(); } void setPosition(const QPoint &pt); |