From ad2ea165501c23cbd85c4ddb155f2d7ea8fc85b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Martins?= Date: Fri, 30 Jan 2015 18:20:08 +0000 Subject: 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 --- src/tools/qdoc/qmlparser/qqmljsast_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/tools/qdoc') diff --git a/src/tools/qdoc/qmlparser/qqmljsast_p.h b/src/tools/qdoc/qmlparser/qqmljsast_p.h index ae79046563..b59222b554 100644 --- a/src/tools/qdoc/qmlparser/qqmljsast_p.h +++ b/src/tools/qdoc/qmlparser/qqmljsast_p.h @@ -2268,8 +2268,8 @@ public: class QML_PARSER_EXPORT UiObjectMember: public Node { public: - virtual SourceLocation firstSourceLocation() const = 0; - virtual SourceLocation lastSourceLocation() const = 0; + virtual SourceLocation firstSourceLocation() const Q_DECL_OVERRIDE = 0; + virtual SourceLocation lastSourceLocation() const Q_DECL_OVERRIDE = 0; virtual UiObjectMember *uiObjectMemberCast() Q_DECL_OVERRIDE; }; -- cgit v1.2.3