From 3f3be0fa64f8745b05a417d3e9c8c20da74d5fa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Martins?= Date: Wed, 4 Feb 2015 23:10:21 +0000 Subject: Fix 590 inconsistent override warnings [-Winconsistent-missing-override] Classes should either use or not use override, otherwise it hurts code readability. Change-Id: Ieb899a3475b0c36ab20285740b2cec2cd1677a54 Reviewed-by: Simon Hausmann --- src/quick/items/qquickitem.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/quick/items/qquickitem.h') diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h index 36c72a967e..463113386b 100644 --- a/src/quick/items/qquickitem.h +++ b/src/quick/items/qquickitem.h @@ -389,8 +389,8 @@ protected: bool heightValid() const; // ### better name? void setImplicitSize(qreal, qreal); - virtual void classBegin(); - virtual void componentComplete(); + void classBegin() Q_DECL_OVERRIDE; + void componentComplete() Q_DECL_OVERRIDE; virtual void keyPressEvent(QKeyEvent *event); virtual void keyReleaseEvent(QKeyEvent *event); -- cgit v1.2.3