Use Q_DECL_OVERRIDE instead of QTC_OVERRIDE

This patch removes src/libs/utils/qtcoverride.h
and uses Q_DECL_OVERRIDE from Qt 5 instead.

Change-Id: I61ffa539648ffe996dc061eec7708c04580c0f09
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

src/libs/qmljs/jsoncheck.h

@@ -37,7 +37,6 @@
 #include <qmljs/qmljsstaticanalysismessage.h>
 
 #include <utils/json.h>
-#include <utils/qtcoverride.h>
 
 #include <QStack>
 #include <QList>
@@ -54,16 +53,16 @@ public:
     QList<StaticAnalysis::Message> operator()(Utils::JsonSchema *schema);
 
 private:
-    bool preVisit(AST::Node *) QTC_OVERRIDE;
+    bool preVisit(AST::Node *) Q_DECL_OVERRIDE;
-    void postVisit(AST::Node *) QTC_OVERRIDE;
+    void postVisit(AST::Node *) Q_DECL_OVERRIDE;
 
-    bool visit(AST::ObjectLiteral *ast) QTC_OVERRIDE;
+    bool visit(AST::ObjectLiteral *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::ArrayLiteral *ast) QTC_OVERRIDE;
+    bool visit(AST::ArrayLiteral *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::NullExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::NullExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::TrueLiteral *ast) QTC_OVERRIDE;
+    bool visit(AST::TrueLiteral *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::FalseLiteral *ast) QTC_OVERRIDE;
+    bool visit(AST::FalseLiteral *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::NumericLiteral *ast) QTC_OVERRIDE;
+    bool visit(AST::NumericLiteral *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::StringLiteral *ast) QTC_OVERRIDE;
+    bool visit(AST::StringLiteral *ast) Q_DECL_OVERRIDE;
 
     struct AnalysisData
     {

src/libs/qmljs/qmljsbind.h

@@ -32,7 +32,6 @@
 
 #include <qmljs/parser/qmljsastvisitor_p.h>
 #include <qmljs/qmljsvalueowner.h>
-#include <utils/qtcoverride.h>
 
 #include <QHash>
 #include <QCoreApplication>
@@ -69,21 +68,21 @@ protected:
 
     void accept(AST::Node *node);
 
-    bool visit(AST::UiProgram *ast) QTC_OVERRIDE;
+    bool visit(AST::UiProgram *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::Program *ast) QTC_OVERRIDE;
+    bool visit(AST::Program *ast) Q_DECL_OVERRIDE;
 
     // Ui
-    bool visit(AST::UiImport *ast) QTC_OVERRIDE;
+    bool visit(AST::UiImport *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UiPublicMember *ast) QTC_OVERRIDE;
+    bool visit(AST::UiPublicMember *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UiObjectDefinition *ast) QTC_OVERRIDE;
+    bool visit(AST::UiObjectDefinition *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UiObjectBinding *ast) QTC_OVERRIDE;
+    bool visit(AST::UiObjectBinding *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UiScriptBinding *ast) QTC_OVERRIDE;
+    bool visit(AST::UiScriptBinding *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UiArrayBinding *ast) QTC_OVERRIDE;
+    bool visit(AST::UiArrayBinding *ast) Q_DECL_OVERRIDE;
 
     // QML/JS
-    bool visit(AST::FunctionDeclaration *ast) QTC_OVERRIDE;
+    bool visit(AST::FunctionDeclaration *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::FunctionExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::FunctionExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::VariableDeclaration *ast) QTC_OVERRIDE;
+    bool visit(AST::VariableDeclaration *ast) Q_DECL_OVERRIDE;
 
     ObjectValue *switchObjectValue(ObjectValue *newObjectValue);
     ObjectValue *bindObject(AST::UiQualifiedId *qualifiedTypeNameId, AST::UiObjectInitializer *initializer);

src/libs/qmljs/qmljscheck.h

@@ -34,7 +34,6 @@
 #include <qmljs/qmljsscopechain.h>
 #include <qmljs/qmljsstaticanalysismessage.h>
 #include <qmljs/parser/qmljsastvisitor_p.h>
-#include <utils/qtcoverride.h>
 
 #include <QCoreApplication>
 #include <QSet>
@@ -61,43 +60,43 @@ public:
     void disableMessage(StaticAnalysis::Type type);
 
 protected:
-    bool preVisit(AST::Node *ast) QTC_OVERRIDE;
+    bool preVisit(AST::Node *ast) Q_DECL_OVERRIDE;
-    void postVisit(AST::Node *ast) QTC_OVERRIDE;
+    void postVisit(AST::Node *ast) Q_DECL_OVERRIDE;
 
-    bool visit(AST::UiProgram *ast) QTC_OVERRIDE;
+    bool visit(AST::UiProgram *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UiObjectDefinition *ast) QTC_OVERRIDE;
+    bool visit(AST::UiObjectDefinition *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UiObjectBinding *ast) QTC_OVERRIDE;
+    bool visit(AST::UiObjectBinding *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UiScriptBinding *ast) QTC_OVERRIDE;
+    bool visit(AST::UiScriptBinding *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UiArrayBinding *ast) QTC_OVERRIDE;
+    bool visit(AST::UiArrayBinding *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UiPublicMember *ast) QTC_OVERRIDE;
+    bool visit(AST::UiPublicMember *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::IdentifierExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::IdentifierExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::FieldMemberExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::FieldMemberExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::FunctionDeclaration *ast) QTC_OVERRIDE;
+    bool visit(AST::FunctionDeclaration *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::FunctionExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::FunctionExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UiObjectInitializer *) QTC_OVERRIDE;
+    bool visit(AST::UiObjectInitializer *) Q_DECL_OVERRIDE;
 
-    bool visit(AST::BinaryExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::BinaryExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::Block *ast) QTC_OVERRIDE;
+    bool visit(AST::Block *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::WithStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::WithStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::VoidExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::VoidExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::Expression *ast) QTC_OVERRIDE;
+    bool visit(AST::Expression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::ExpressionStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::ExpressionStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::IfStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::IfStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::ForStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::ForStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::LocalForStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::LocalForStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::WhileStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::WhileStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::DoWhileStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::DoWhileStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::CaseBlock *ast) QTC_OVERRIDE;
+    bool visit(AST::CaseBlock *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::NewExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::NewExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::NewMemberExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::NewMemberExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::CallExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::CallExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::StatementList *ast) QTC_OVERRIDE;
+    bool visit(AST::StatementList *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::ReturnStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::ReturnStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::ThrowStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::ThrowStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::DeleteExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::DeleteExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::TypeOfExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::TypeOfExpression *ast) Q_DECL_OVERRIDE;
 
-    void endVisit(QmlJS::AST::UiObjectInitializer *) QTC_OVERRIDE;
+    void endVisit(QmlJS::AST::UiObjectInitializer *) Q_DECL_OVERRIDE;
 
 private:
     void visitQmlObject(AST::Node *ast, AST::UiQualifiedId *typeId,

src/libs/qmljs/qmljscodeformatter.h

@@ -34,7 +34,6 @@
 
 #include "qmljsscanner.h"
 
-#include <utils/qtcoverride.h>
 #include <QStack>
 #include <QList>
 #include <QVector>
@@ -324,8 +323,8 @@ public:
     void setIndentSize(int size);
 
 protected:
-    void onEnter(int newState, int *indentDepth, int *savedIndentDepth) const QTC_OVERRIDE;
+    void onEnter(int newState, int *indentDepth, int *savedIndentDepth) const Q_DECL_OVERRIDE;
-    void adjustIndent(const QList<QmlJS::Token> &tokens, int lexerState, int *indentDepth) const QTC_OVERRIDE;
+    void adjustIndent(const QList<QmlJS::Token> &tokens, int lexerState, int *indentDepth) const Q_DECL_OVERRIDE;
 
 private:
     int m_indentSize;

src/libs/qmljs/qmljsdescribevalue.cpp

@@ -187,7 +187,7 @@ public:
         return true;
     }
 
-    bool processProperty(const QString &name, const Value *value, const PropertyInfo &pInfo) QTC_OVERRIDE
+    bool processProperty(const QString &name, const Value *value, const PropertyInfo &pInfo) Q_DECL_OVERRIDE
     {
         d.dumpNewline();
         d.dump(name);
@@ -200,19 +200,19 @@ public:
         d.closeContext("");
         return true;
     }
-    bool processEnumerator(const QString &name, const Value *value) QTC_OVERRIDE
+    bool processEnumerator(const QString &name, const Value *value) Q_DECL_OVERRIDE
     {
         return dump(name, value);
     }
-    bool processSignal(const QString &name, const Value *value) QTC_OVERRIDE
+    bool processSignal(const QString &name, const Value *value) Q_DECL_OVERRIDE
     {
         return dump(name, value);
     }
-    bool processSlot(const QString &name, const Value *value) QTC_OVERRIDE
+    bool processSlot(const QString &name, const Value *value) Q_DECL_OVERRIDE
     {
         return dump(name, value);
     }
-    bool processGeneratedSlot(const QString &name, const Value *value) QTC_OVERRIDE
+    bool processGeneratedSlot(const QString &name, const Value *value) Q_DECL_OVERRIDE
     {
         return dump(name, value);
     }

src/libs/qmljs/qmljsdescribevalue.h

@@ -48,17 +48,17 @@ public:
     virtual ~DescribeValueVisitor();
 
     QString operator()(const Value *value);
-    void visit(const NullValue *) QTC_OVERRIDE;
+    void visit(const NullValue *) Q_DECL_OVERRIDE;
-    void visit(const UndefinedValue *) QTC_OVERRIDE;
+    void visit(const UndefinedValue *) Q_DECL_OVERRIDE;
-    void visit(const UnknownValue *) QTC_OVERRIDE;
+    void visit(const UnknownValue *) Q_DECL_OVERRIDE;
-    void visit(const NumberValue *) QTC_OVERRIDE;
+    void visit(const NumberValue *) Q_DECL_OVERRIDE;
-    void visit(const BooleanValue *) QTC_OVERRIDE;
+    void visit(const BooleanValue *) Q_DECL_OVERRIDE;
-    void visit(const StringValue *) QTC_OVERRIDE;
+    void visit(const StringValue *) Q_DECL_OVERRIDE;
-    void visit(const ObjectValue *) QTC_OVERRIDE;
+    void visit(const ObjectValue *) Q_DECL_OVERRIDE;
-    void visit(const FunctionValue *) QTC_OVERRIDE;
+    void visit(const FunctionValue *) Q_DECL_OVERRIDE;
-    void visit(const Reference *) QTC_OVERRIDE;
+    void visit(const Reference *) Q_DECL_OVERRIDE;
-    void visit(const ColorValue *) QTC_OVERRIDE;
+    void visit(const ColorValue *) Q_DECL_OVERRIDE;
-    void visit(const AnchorLineValue *) QTC_OVERRIDE;
+    void visit(const AnchorLineValue *) Q_DECL_OVERRIDE;
     QString description() const;
     void basicDump(const char *baseName, const Value *value, bool opensContext);
     void dumpNewline();

src/libs/qmljs/qmljsevaluate.h

@@ -34,7 +34,6 @@
 #include "qmljsdocument.h"
 #include "qmljsscopechain.h"
 
-#include <utils/qtcoverride.h>
 
 namespace QmlJS {
 
@@ -65,99 +64,99 @@ protected:
     const Value *switchResult(const Value *result);
 
     // Ui
-    bool visit(AST::UiProgram *ast) QTC_OVERRIDE;
+    bool visit(AST::UiProgram *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UiHeaderItemList *ast) QTC_OVERRIDE;
+    bool visit(AST::UiHeaderItemList *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UiQualifiedPragmaId *ast) QTC_OVERRIDE;
+    bool visit(AST::UiQualifiedPragmaId *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UiPragma *ast) QTC_OVERRIDE;
+    bool visit(AST::UiPragma *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UiImport *ast) QTC_OVERRIDE;
+    bool visit(AST::UiImport *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UiPublicMember *ast) QTC_OVERRIDE;
+    bool visit(AST::UiPublicMember *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UiSourceElement *ast) QTC_OVERRIDE;
+    bool visit(AST::UiSourceElement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UiObjectDefinition *ast) QTC_OVERRIDE;
+    bool visit(AST::UiObjectDefinition *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UiObjectInitializer *ast) QTC_OVERRIDE;
+    bool visit(AST::UiObjectInitializer *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UiObjectBinding *ast) QTC_OVERRIDE;
+    bool visit(AST::UiObjectBinding *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UiScriptBinding *ast) QTC_OVERRIDE;
+    bool visit(AST::UiScriptBinding *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UiArrayBinding *ast) QTC_OVERRIDE;
+    bool visit(AST::UiArrayBinding *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UiObjectMemberList *ast) QTC_OVERRIDE;
+    bool visit(AST::UiObjectMemberList *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UiArrayMemberList *ast) QTC_OVERRIDE;
+    bool visit(AST::UiArrayMemberList *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UiQualifiedId *ast) QTC_OVERRIDE;
+    bool visit(AST::UiQualifiedId *ast) Q_DECL_OVERRIDE;
 
     // QmlJS
-    bool visit(AST::ThisExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::ThisExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::IdentifierExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::IdentifierExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::NullExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::NullExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::TrueLiteral *ast) QTC_OVERRIDE;
+    bool visit(AST::TrueLiteral *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::FalseLiteral *ast) QTC_OVERRIDE;
+    bool visit(AST::FalseLiteral *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::StringLiteral *ast) QTC_OVERRIDE;
+    bool visit(AST::StringLiteral *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::NumericLiteral *ast) QTC_OVERRIDE;
+    bool visit(AST::NumericLiteral *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::RegExpLiteral *ast) QTC_OVERRIDE;
+    bool visit(AST::RegExpLiteral *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::ArrayLiteral *ast) QTC_OVERRIDE;
+    bool visit(AST::ArrayLiteral *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::ObjectLiteral *ast) QTC_OVERRIDE;
+    bool visit(AST::ObjectLiteral *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::ElementList *ast) QTC_OVERRIDE;
+    bool visit(AST::ElementList *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::Elision *ast) QTC_OVERRIDE;
+    bool visit(AST::Elision *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::PropertyAssignmentList *ast) QTC_OVERRIDE;
+    bool visit(AST::PropertyAssignmentList *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::PropertyGetterSetter *ast) QTC_OVERRIDE;
+    bool visit(AST::PropertyGetterSetter *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::PropertyNameAndValue *ast) QTC_OVERRIDE;
+    bool visit(AST::PropertyNameAndValue *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::NestedExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::NestedExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::IdentifierPropertyName *ast) QTC_OVERRIDE;
+    bool visit(AST::IdentifierPropertyName *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::StringLiteralPropertyName *ast) QTC_OVERRIDE;
+    bool visit(AST::StringLiteralPropertyName *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::NumericLiteralPropertyName *ast) QTC_OVERRIDE;
+    bool visit(AST::NumericLiteralPropertyName *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::ArrayMemberExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::ArrayMemberExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::FieldMemberExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::FieldMemberExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::NewMemberExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::NewMemberExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::NewExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::NewExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::CallExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::CallExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::ArgumentList *ast) QTC_OVERRIDE;
+    bool visit(AST::ArgumentList *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::PostIncrementExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::PostIncrementExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::PostDecrementExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::PostDecrementExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::DeleteExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::DeleteExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::VoidExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::VoidExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::TypeOfExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::TypeOfExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::PreIncrementExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::PreIncrementExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::PreDecrementExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::PreDecrementExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UnaryPlusExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::UnaryPlusExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::UnaryMinusExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::UnaryMinusExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::TildeExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::TildeExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::NotExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::NotExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::BinaryExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::BinaryExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::ConditionalExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::ConditionalExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::Expression *ast) QTC_OVERRIDE;
+    bool visit(AST::Expression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::Block *ast) QTC_OVERRIDE;
+    bool visit(AST::Block *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::StatementList *ast) QTC_OVERRIDE;
+    bool visit(AST::StatementList *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::VariableStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::VariableStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::VariableDeclarationList *ast) QTC_OVERRIDE;
+    bool visit(AST::VariableDeclarationList *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::VariableDeclaration *ast) QTC_OVERRIDE;
+    bool visit(AST::VariableDeclaration *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::EmptyStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::EmptyStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::ExpressionStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::ExpressionStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::IfStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::IfStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::DoWhileStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::DoWhileStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::WhileStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::WhileStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::ForStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::ForStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::LocalForStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::LocalForStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::ForEachStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::ForEachStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::LocalForEachStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::LocalForEachStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::ContinueStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::ContinueStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::BreakStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::BreakStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::ReturnStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::ReturnStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::WithStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::WithStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::SwitchStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::SwitchStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::CaseBlock *ast) QTC_OVERRIDE;
+    bool visit(AST::CaseBlock *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::CaseClauses *ast) QTC_OVERRIDE;
+    bool visit(AST::CaseClauses *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::CaseClause *ast) QTC_OVERRIDE;
+    bool visit(AST::CaseClause *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::DefaultClause *ast) QTC_OVERRIDE;
+    bool visit(AST::DefaultClause *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::LabelledStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::LabelledStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::ThrowStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::ThrowStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::TryStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::TryStatement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::Catch *ast) QTC_OVERRIDE;
+    bool visit(AST::Catch *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::Finally *ast) QTC_OVERRIDE;
+    bool visit(AST::Finally *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::FunctionDeclaration *ast) QTC_OVERRIDE;
+    bool visit(AST::FunctionDeclaration *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::FunctionExpression *ast) QTC_OVERRIDE;
+    bool visit(AST::FunctionExpression *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::FormalParameterList *ast) QTC_OVERRIDE;
+    bool visit(AST::FormalParameterList *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::FunctionBody *ast) QTC_OVERRIDE;
+    bool visit(AST::FunctionBody *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::Program *ast) QTC_OVERRIDE;
+    bool visit(AST::Program *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::SourceElements *ast) QTC_OVERRIDE;
+    bool visit(AST::SourceElements *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::FunctionSourceElement *ast) QTC_OVERRIDE;
+    bool visit(AST::FunctionSourceElement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::StatementSourceElement *ast) QTC_OVERRIDE;
+    bool visit(AST::StatementSourceElement *ast) Q_DECL_OVERRIDE;
-    bool visit(AST::DebuggerStatement *ast) QTC_OVERRIDE;
+    bool visit(AST::DebuggerStatement *ast) Q_DECL_OVERRIDE;
 
 private:
     QmlJS::Document::Ptr _doc;

src/libs/qmljs/qmljsimportdependencies.h

@@ -34,7 +34,6 @@
 #include "qmljsdialect.h"
 
 #include <languageutils/componentversion.h>
-#include <utils/qtcoverride.h>
 
 #include <QObject>
 #include <QString>

src/libs/qmljs/qmljsinterpreter.h

@@ -34,7 +34,6 @@
 #include <qmljs/qmljsconstants.h>
 #include <qmljs/qmljsdocument.h>
 #include <qmljs/qmljsimportdependencies.h>
-#include <utils/qtcoverride.h>
 
 #include <QFileInfoList>
 #include <QHash>
@@ -331,61 +330,61 @@ template <> Q_INLINE_TEMPLATE const ASTSignal *value_cast(const Value *v)
 class QMLJS_EXPORT NullValue: public Value
 {
 public:
-    const NullValue *asNullValue() const QTC_OVERRIDE;
+    const NullValue *asNullValue() const Q_DECL_OVERRIDE;
-    void accept(ValueVisitor *visitor) const QTC_OVERRIDE;
+    void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE;
 };
 
 class QMLJS_EXPORT UndefinedValue: public Value
 {
 public:
-    const UndefinedValue *asUndefinedValue() const QTC_OVERRIDE;
+    const UndefinedValue *asUndefinedValue() const Q_DECL_OVERRIDE;
-    void accept(ValueVisitor *visitor) const QTC_OVERRIDE;
+    void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE;
 };
 
 class QMLJS_EXPORT UnknownValue: public Value
 {
 public:
-    const UnknownValue *asUnknownValue() const QTC_OVERRIDE;
+    const UnknownValue *asUnknownValue() const Q_DECL_OVERRIDE;
-    void accept(ValueVisitor *) const QTC_OVERRIDE;
+    void accept(ValueVisitor *) const Q_DECL_OVERRIDE;
 };
 
 class QMLJS_EXPORT NumberValue: public Value
 {
 public:
-    const NumberValue *asNumberValue() const QTC_OVERRIDE;
+    const NumberValue *asNumberValue() const Q_DECL_OVERRIDE;
-    void accept(ValueVisitor *visitor) const QTC_OVERRIDE;
+    void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE;
 };
 
 class QMLJS_EXPORT RealValue: public NumberValue
 {
 public:
-    const RealValue *asRealValue() const QTC_OVERRIDE;
+    const RealValue *asRealValue() const Q_DECL_OVERRIDE;
 };
 
 class QMLJS_EXPORT IntValue: public NumberValue
 {
 public:
-    const IntValue *asIntValue() const QTC_OVERRIDE;
+    const IntValue *asIntValue() const Q_DECL_OVERRIDE;
 };
 
 class QMLJS_EXPORT BooleanValue: public Value
 {
 public:
-    const BooleanValue *asBooleanValue() const QTC_OVERRIDE;
+    const BooleanValue *asBooleanValue() const Q_DECL_OVERRIDE;
-    void accept(ValueVisitor *visitor) const QTC_OVERRIDE;
+    void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE;
 };
 
 class QMLJS_EXPORT StringValue: public Value
 {
 public:
-    const StringValue *asStringValue() const QTC_OVERRIDE;
+    const StringValue *asStringValue() const Q_DECL_OVERRIDE;
-    void accept(ValueVisitor *visitor) const QTC_OVERRIDE;
+    void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE;
 };
 
 class QMLJS_EXPORT UrlValue: public StringValue
 {
 public:
-    const UrlValue *asUrlValue() const QTC_OVERRIDE;
+    const UrlValue *asUrlValue() const Q_DECL_OVERRIDE;
 };
 
 class PropertyInfo {
@@ -453,8 +452,8 @@ public:
     ValueOwner *valueOwner() const;
 
     // Value interface
-    const Reference *asReference() const QTC_OVERRIDE;
+    const Reference *asReference() const Q_DECL_OVERRIDE;
-    void accept(ValueVisitor *) const QTC_OVERRIDE;
+    void accept(ValueVisitor *) const Q_DECL_OVERRIDE;
 
 private:
     virtual const Value *value(ReferenceContext *referenceContext) const;
@@ -467,16 +466,16 @@ class QMLJS_EXPORT ColorValue: public Value
 {
 public:
     // Value interface
-    const ColorValue *asColorValue() const QTC_OVERRIDE;
+    const ColorValue *asColorValue() const Q_DECL_OVERRIDE;
-    void accept(ValueVisitor *) const QTC_OVERRIDE;
+    void accept(ValueVisitor *) const Q_DECL_OVERRIDE;
 };
 
 class QMLJS_EXPORT AnchorLineValue: public Value
 {
 public:
     // Value interface
-    const AnchorLineValue *asAnchorLineValue() const QTC_OVERRIDE;
+    const AnchorLineValue *asAnchorLineValue() const Q_DECL_OVERRIDE;
-    void accept(ValueVisitor *) const QTC_OVERRIDE;
+    void accept(ValueVisitor *) const Q_DECL_OVERRIDE;
 };
 
 class QMLJS_EXPORT PropertyData {
@@ -523,8 +522,8 @@ public:
     { return lookupMember(name, context.data(), foundInObject, examinePrototypes); }
 
     // Value interface
-    const ObjectValue *asObjectValue() const QTC_OVERRIDE;
+    const ObjectValue *asObjectValue() const Q_DECL_OVERRIDE;
-    void accept(ValueVisitor *visitor) const QTC_OVERRIDE;
+    void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE;
     QString originId() const
     { return m_originId; }
 
@@ -576,7 +575,7 @@ public:
     QmlEnumValue(const CppComponentValue *owner, int index);
     ~QmlEnumValue();
 
-    const QmlEnumValue *asQmlEnumValue() const QTC_OVERRIDE;
+    const QmlEnumValue *asQmlEnumValue() const Q_DECL_OVERRIDE;
 
     QString name() const;
     QStringList keys() const;
@@ -599,9 +598,9 @@ public:
                    ValueOwner *valueOwner, const QString &originId);
     ~CppComponentValue();
 
-    const CppComponentValue *asCppComponentValue() const QTC_OVERRIDE;
+    const CppComponentValue *asCppComponentValue() const Q_DECL_OVERRIDE;
 
-    void processMembers(MemberProcessor *processor) const QTC_OVERRIDE;
+    void processMembers(MemberProcessor *processor) const Q_DECL_OVERRIDE;
     const Value *valueForCppName(const QString &typeName) const;
 
     using ObjectValue::prototype;
@@ -670,8 +669,8 @@ public:
     virtual const Value *argument(int index) const;
 
     // Value interface
-    const FunctionValue *asFunctionValue() const QTC_OVERRIDE;
+    const FunctionValue *asFunctionValue() const Q_DECL_OVERRIDE;
-    void accept(ValueVisitor *visitor) const QTC_OVERRIDE;
+    void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE;
 };
 
 class QMLJS_EXPORT Function: public FunctionValue
@@ -686,13 +685,13 @@ public:
     void setOptionalNamedArgumentCount(int count);
 
     // FunctionValue interface
-    const Value *returnValue() const QTC_OVERRIDE;
+    const Value *returnValue() const Q_DECL_OVERRIDE;
-    int namedArgumentCount() const QTC_OVERRIDE;
+    int namedArgumentCount() const Q_DECL_OVERRIDE;
-    int optionalNamedArgumentCount() const QTC_OVERRIDE;
+    int optionalNamedArgumentCount() const Q_DECL_OVERRIDE;
-    const Value *argument(int index) const QTC_OVERRIDE;
+    const Value *argument(int index) const Q_DECL_OVERRIDE;
-    QString argumentName(int index) const QTC_OVERRIDE;
+    QString argumentName(int index) const Q_DECL_OVERRIDE;
-    bool isVariadic() const QTC_OVERRIDE;
+    bool isVariadic() const Q_DECL_OVERRIDE;
-    const Function *asFunction() const QTC_OVERRIDE;
+    const Function *asFunction() const Q_DECL_OVERRIDE;
 
 private:
     ValueList m_arguments;
@@ -784,13 +783,13 @@ public:
 protected:
     const Value *switchResult(const Value *value);
 
-    void visit(const NullValue *) QTC_OVERRIDE;
+    void visit(const NullValue *) Q_DECL_OVERRIDE;
-    void visit(const UndefinedValue *) QTC_OVERRIDE;
+    void visit(const UndefinedValue *) Q_DECL_OVERRIDE;
-    void visit(const NumberValue *) QTC_OVERRIDE;
+    void visit(const NumberValue *) Q_DECL_OVERRIDE;
-    void visit(const BooleanValue *) QTC_OVERRIDE;
+    void visit(const BooleanValue *) Q_DECL_OVERRIDE;
-    void visit(const StringValue *) QTC_OVERRIDE;
+    void visit(const StringValue *) Q_DECL_OVERRIDE;
-    void visit(const ObjectValue *) QTC_OVERRIDE;
+    void visit(const ObjectValue *) Q_DECL_OVERRIDE;
-    void visit(const FunctionValue *) QTC_OVERRIDE;
+    void visit(const FunctionValue *) Q_DECL_OVERRIDE;
 
 private:
     ValueOwner *m_valueOwner;
@@ -807,13 +806,13 @@ public:
 protected:
     const Value *switchResult(const Value *value);
 
-    void visit(const NullValue *) QTC_OVERRIDE;
+    void visit(const NullValue *) Q_DECL_OVERRIDE;
-    void visit(const UndefinedValue *) QTC_OVERRIDE;
+    void visit(const UndefinedValue *) Q_DECL_OVERRIDE;
-    void visit(const NumberValue *) QTC_OVERRIDE;
+    void visit(const NumberValue *) Q_DECL_OVERRIDE;
-    void visit(const BooleanValue *) QTC_OVERRIDE;
+    void visit(const BooleanValue *) Q_DECL_OVERRIDE;
-    void visit(const StringValue *) QTC_OVERRIDE;
+    void visit(const StringValue *) Q_DECL_OVERRIDE;
-    void visit(const ObjectValue *) QTC_OVERRIDE;
+    void visit(const ObjectValue *) Q_DECL_OVERRIDE;
-    void visit(const FunctionValue *) QTC_OVERRIDE;
+    void visit(const FunctionValue *) Q_DECL_OVERRIDE;
 
 private:
     ValueOwner *m_valueOwner;
@@ -830,13 +829,13 @@ public:
 protected:
     const Value *switchResult(const Value *value);
 
-    void visit(const NullValue *) QTC_OVERRIDE;
+    void visit(const NullValue *) Q_DECL_OVERRIDE;
-    void visit(const UndefinedValue *) QTC_OVERRIDE;
+    void visit(const UndefinedValue *) Q_DECL_OVERRIDE;
-    void visit(const NumberValue *) QTC_OVERRIDE;
+    void visit(const NumberValue *) Q_DECL_OVERRIDE;
-    void visit(const BooleanValue *) QTC_OVERRIDE;
+    void visit(const BooleanValue *) Q_DECL_OVERRIDE;
-    void visit(const StringValue *) QTC_OVERRIDE;
+    void visit(const StringValue *) Q_DECL_OVERRIDE;
-    void visit(const ObjectValue *) QTC_OVERRIDE;
+    void visit(const ObjectValue *) Q_DECL_OVERRIDE;
-    void visit(const FunctionValue *) QTC_OVERRIDE;
+    void visit(const FunctionValue *) Q_DECL_OVERRIDE;
 
 private:
     ValueOwner *m_valueOwner;
@@ -851,15 +850,15 @@ public:
     QString operator()(const Value *value);
 
 protected:
-    void visit(const NullValue *) QTC_OVERRIDE;
+    void visit(const NullValue *) Q_DECL_OVERRIDE;
-    void visit(const UndefinedValue *) QTC_OVERRIDE;
+    void visit(const UndefinedValue *) Q_DECL_OVERRIDE;
-    void visit(const NumberValue *) QTC_OVERRIDE;
+    void visit(const NumberValue *) Q_DECL_OVERRIDE;
-    void visit(const BooleanValue *) QTC_OVERRIDE;
+    void visit(const BooleanValue *) Q_DECL_OVERRIDE;
-    void visit(const StringValue *) QTC_OVERRIDE;
+    void visit(const StringValue *) Q_DECL_OVERRIDE;
-    void visit(const ObjectValue *object) QTC_OVERRIDE;
+    void visit(const ObjectValue *object) Q_DECL_OVERRIDE;
-    void visit(const FunctionValue *object) QTC_OVERRIDE;
+    void visit(const FunctionValue *object) Q_DECL_OVERRIDE;
-    void visit(const ColorValue *) QTC_OVERRIDE;
+    void visit(const ColorValue *) Q_DECL_OVERRIDE;
-    void visit(const AnchorLineValue *) QTC_OVERRIDE;
+    void visit(const AnchorLineValue *) Q_DECL_OVERRIDE;
 };
 
 // internal
@@ -869,12 +868,12 @@ public:
     QmlPrototypeReference(AST::UiQualifiedId *qmlTypeName, const Document *doc, ValueOwner *valueOwner);
     ~QmlPrototypeReference();
 
-    const QmlPrototypeReference *asQmlPrototypeReference() const QTC_OVERRIDE;
+    const QmlPrototypeReference *asQmlPrototypeReference() const Q_DECL_OVERRIDE;
 
     AST::UiQualifiedId *qmlTypeName() const;
 
 private:
-    const Value *value(ReferenceContext *referenceContext) const QTC_OVERRIDE;
+    const Value *value(ReferenceContext *referenceContext) const Q_DECL_OVERRIDE;
 
     AST::UiQualifiedId *m_qmlTypeName;
     const Document *m_doc;
@@ -888,11 +887,11 @@ class QMLJS_EXPORT ASTVariableReference: public Reference
 public:
     ASTVariableReference(AST::VariableDeclaration *ast, const Document *doc, ValueOwner *valueOwner);
     ~ASTVariableReference();
-    const ASTVariableReference *asAstVariableReference() const QTC_OVERRIDE;
+    const ASTVariableReference *asAstVariableReference() const Q_DECL_OVERRIDE;
     const AST::VariableDeclaration *ast() const;
 private:
-    const Value *value(ReferenceContext *referenceContext) const QTC_OVERRIDE;
+    const Value *value(ReferenceContext *referenceContext) const Q_DECL_OVERRIDE;
-    bool getSourceLocation(QString *fileName, int *line, int *column) const QTC_OVERRIDE;
+    bool getSourceLocation(QString *fileName, int *line, int *column) const Q_DECL_OVERRIDE;
 };
 
 class QMLJS_EXPORT ASTFunctionValue: public FunctionValue
@@ -908,12 +907,12 @@ public:
 
     AST::FunctionExpression *ast() const;
 
-    int namedArgumentCount() const QTC_OVERRIDE;
+    int namedArgumentCount() const Q_DECL_OVERRIDE;
-    QString argumentName(int index) const QTC_OVERRIDE;
+    QString argumentName(int index) const Q_DECL_OVERRIDE;
-    bool isVariadic() const QTC_OVERRIDE;
+    bool isVariadic() const Q_DECL_OVERRIDE;
-    const ASTFunctionValue *asAstFunctionValue() const QTC_OVERRIDE;
+    const ASTFunctionValue *asAstFunctionValue() const Q_DECL_OVERRIDE;
 
-    bool getSourceLocation(QString *fileName, int *line, int *column) const QTC_OVERRIDE;
+    bool getSourceLocation(QString *fileName, int *line, int *column) const Q_DECL_OVERRIDE;
 };
 
 class QMLJS_EXPORT ASTPropertyReference: public Reference
@@ -926,15 +925,15 @@ public:
     ASTPropertyReference(AST::UiPublicMember *ast, const Document *doc, ValueOwner *valueOwner);
     ~ASTPropertyReference();
 
-    const ASTPropertyReference *asAstPropertyReference() const QTC_OVERRIDE;
+    const ASTPropertyReference *asAstPropertyReference() const Q_DECL_OVERRIDE;
 
     AST::UiPublicMember *ast() const { return m_ast; }
     QString onChangedSlotName() const { return m_onChangedSlotName; }
 
-    bool getSourceLocation(QString *fileName, int *line, int *column) const QTC_OVERRIDE;
+    bool getSourceLocation(QString *fileName, int *line, int *column) const Q_DECL_OVERRIDE;
 
 private:
-    const Value *value(ReferenceContext *referenceContext) const QTC_OVERRIDE;
+    const Value *value(ReferenceContext *referenceContext) const Q_DECL_OVERRIDE;
 };
 
 class QMLJS_EXPORT ASTSignal: public FunctionValue
@@ -948,19 +947,19 @@ public:
     ASTSignal(AST::UiPublicMember *ast, const Document *doc, ValueOwner *valueOwner);
     ~ASTSignal();
 
-    const ASTSignal *asAstSignal() const QTC_OVERRIDE;
+    const ASTSignal *asAstSignal() const Q_DECL_OVERRIDE;
 
     AST::UiPublicMember *ast() const { return m_ast; }
     QString slotName() const { return m_slotName; }
     const ObjectValue *bodyScope() const { return m_bodyScope; }
 
     // FunctionValue interface
-    int namedArgumentCount() const QTC_OVERRIDE;
+    int namedArgumentCount() const Q_DECL_OVERRIDE;
-    const Value *argument(int index) const QTC_OVERRIDE;
+    const Value *argument(int index) const Q_DECL_OVERRIDE;
-    QString argumentName(int index) const QTC_OVERRIDE;
+    QString argumentName(int index) const Q_DECL_OVERRIDE;
 
     // Value interface
-    bool getSourceLocation(QString *fileName, int *line, int *column) const QTC_OVERRIDE;
+    bool getSourceLocation(QString *fileName, int *line, int *column) const Q_DECL_OVERRIDE;
 };
 
 class QMLJS_EXPORT ASTObjectValue: public ObjectValue
@@ -979,10 +978,10 @@ public:
                    ValueOwner *valueOwner);
     ~ASTObjectValue();
 
-    const ASTObjectValue *asAstObjectValue() const QTC_OVERRIDE;
+    const ASTObjectValue *asAstObjectValue() const Q_DECL_OVERRIDE;
 
     bool getSourceLocation(QString *fileName, int *line, int *column) const;
-    void processMembers(MemberProcessor *processor) const QTC_OVERRIDE;
+    void processMembers(MemberProcessor *processor) const Q_DECL_OVERRIDE;
 
     QString defaultPropertyName() const;
 
@@ -1056,8 +1055,8 @@ public:
     virtual const Value *lookupMember(const QString &name, const Context *context,
                                       const ObjectValue **foundInObject = 0,
                                       bool examinePrototypes = true) const;
-    void processMembers(MemberProcessor *processor) const QTC_OVERRIDE;
+    void processMembers(MemberProcessor *processor) const Q_DECL_OVERRIDE;
-    const TypeScope *asTypeScope() const QTC_OVERRIDE;
+    const TypeScope *asTypeScope() const Q_DECL_OVERRIDE;
 private:
     const Imports *m_imports;
 };
@@ -1070,8 +1069,8 @@ public:
     virtual const Value *lookupMember(const QString &name, const Context *context,
                                       const ObjectValue **foundInObject = 0,
                                       bool examinePrototypes = true) const;
-    void processMembers(MemberProcessor *processor) const QTC_OVERRIDE;
+    void processMembers(MemberProcessor *processor) const Q_DECL_OVERRIDE;
-    const JSImportScope *asJSImportScope() const QTC_OVERRIDE;
+    const JSImportScope *asJSImportScope() const Q_DECL_OVERRIDE;
 private:
     const Imports *m_imports;
 };

src/libs/qmljs/qmljsscopeastpath.h

@@ -33,7 +33,6 @@
 #include "qmljs_global.h"
 #include "parser/qmljsastvisitor_p.h"
 #include "qmljsdocument.h"
-#include <utils/qtcoverride.h>
 
 namespace QmlJS {
 
@@ -49,13 +48,13 @@ protected:
 
     using Visitor::visit;
 
-    bool preVisit(AST::Node *node) QTC_OVERRIDE;
+    bool preVisit(AST::Node *node) Q_DECL_OVERRIDE;
-    bool visit(AST::UiPublicMember *node) QTC_OVERRIDE;
+    bool visit(AST::UiPublicMember *node) Q_DECL_OVERRIDE;
-    bool visit(AST::UiScriptBinding *node) QTC_OVERRIDE;
+    bool visit(AST::UiScriptBinding *node) Q_DECL_OVERRIDE;
-    bool visit(AST::UiObjectDefinition *node) QTC_OVERRIDE;
+    bool visit(AST::UiObjectDefinition *node) Q_DECL_OVERRIDE;
-    bool visit(AST::UiObjectBinding *node) QTC_OVERRIDE;
+    bool visit(AST::UiObjectBinding *node) Q_DECL_OVERRIDE;
-    bool visit(AST::FunctionDeclaration *node) QTC_OVERRIDE;
+    bool visit(AST::FunctionDeclaration *node) Q_DECL_OVERRIDE;
-    bool visit(AST::FunctionExpression *node) QTC_OVERRIDE;
+    bool visit(AST::FunctionExpression *node) Q_DECL_OVERRIDE;
 
 private:
     bool containsOffset(AST::SourceLocation start, AST::SourceLocation end);

src/libs/qmljs/qmljssimplereader.h

@@ -33,7 +33,6 @@
 #include <qmljs/qmljs_global.h>
 #include <qmljs/parser/qmljsastfwd_p.h>
 
-#include <utils/qtcoverride.h>
 
 #include <QHash>
 #include <QList>
@@ -122,9 +121,9 @@ public:
     SimpleReaderNode::Ptr readFromSource(const QString &source);
 
 protected:
-    void elementStart(const QString &name) QTC_OVERRIDE;
+    void elementStart(const QString &name) Q_DECL_OVERRIDE;
-    void elementEnd() QTC_OVERRIDE;
+    void elementEnd() Q_DECL_OVERRIDE;
-    void propertyDefinition(const QString &name, const QVariant &value) QTC_OVERRIDE;
+    void propertyDefinition(const QString &name, const QVariant &value) Q_DECL_OVERRIDE;
 
 private:
     SimpleReaderNode::Ptr m_rootNode;

src/libs/qmljs/qmljsvalueowner.cpp

@@ -53,7 +53,7 @@ public:
     QtObjectPrototypeReference(ValueOwner *owner)
         : Reference(owner)
     {}
-    const QtObjectPrototypeReference *asQtObjectPrototypeReference() const QTC_OVERRIDE
+    const QtObjectPrototypeReference *asQtObjectPrototypeReference() const Q_DECL_OVERRIDE
     {
         return this;
     }

src/libs/utils/qtcoverride.h

@@ -1,41 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#ifndef QTC_OVERRIDE_H
-#define QTC_OVERRIDE_H
-
-#include <qglobal.h>
-
-#ifdef Q_DECL_OVERRIDE
-#define QTC_OVERRIDE Q_DECL_OVERRIDE
-#else
-#define QTC_OVERRIDE
-#endif
-
-#endif // QTC_OVERRIDE_H

src/libs/utils/utils-lib.pri

@@ -176,7 +176,6 @@ HEADERS += \
     $$PWD/tooltip/reuse.h \
     $$PWD/tooltip/effects.h \
     $$PWD/unixutils.h \
-    $$PWD/qtcoverride.h \
     $$PWD/ansiescapecodehandler.h \
     $$PWD/execmenu.h \
     $$PWD/completinglineedit.h \

src/plugins/beautifier/artisticstyle/artisticstyle.h

@@ -32,7 +32,6 @@
 
 #include "../beautifierabstracttool.h"
 
-#include <utils/qtcoverride.h>
 
 QT_FORWARD_DECLARE_CLASS(QAction)
 
@@ -52,9 +51,9 @@ class ArtisticStyle : public BeautifierAbstractTool
 public:
     explicit ArtisticStyle(BeautifierPlugin *parent = 0);
     virtual ~ArtisticStyle();
-    bool initialize() QTC_OVERRIDE;
+    bool initialize() Q_DECL_OVERRIDE;
-    void updateActions(Core::IEditor *editor) QTC_OVERRIDE;
+    void updateActions(Core::IEditor *editor) Q_DECL_OVERRIDE;
-    QList<QObject *> autoReleaseObjects() QTC_OVERRIDE;
+    QList<QObject *> autoReleaseObjects() Q_DECL_OVERRIDE;
 
 private slots:
     void formatFile();

src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h

@@ -31,7 +31,6 @@
 #define BEAUTIFIER_ARTISTICSTYLEOPTIONSPAGE_H
 
 #include <coreplugin/dialogs/ioptionspage.h>
-#include <utils/qtcoverride.h>
 
 #include <QPointer>
 #include <QWidget>
@@ -65,9 +64,9 @@ class ArtisticStyleOptionsPage : public Core::IOptionsPage
 
 public:
     explicit ArtisticStyleOptionsPage(ArtisticStyleSettings *settings, QObject *parent = 0);
-    QWidget *widget() QTC_OVERRIDE;
+    QWidget *widget() Q_DECL_OVERRIDE;
-    void apply() QTC_OVERRIDE;
+    void apply() Q_DECL_OVERRIDE;
-    void finish() QTC_OVERRIDE;
+    void finish() Q_DECL_OVERRIDE;
 
 private:
     QPointer<ArtisticStyleOptionsPageWidget> m_widget;

src/plugins/beautifier/artisticstyle/artisticstylesettings.h

@@ -32,7 +32,6 @@
 
 #include "../abstractsettings.h"
 
-#include <utils/qtcoverride.h>
 
 #include <QFuture>
 #include <QFutureWatcher>
@@ -52,7 +51,7 @@ public:
 
     ArtisticStyleSettings();
 
-    void updateVersion() QTC_OVERRIDE;
+    void updateVersion() Q_DECL_OVERRIDE;
 
     bool useOtherFiles() const;
     void setUseOtherFiles(bool useOtherFiles);
@@ -66,8 +65,8 @@ public:
     QString customStyle() const;
     void setCustomStyle(const QString &customStyle);
 
-    QString documentationFilePath() const QTC_OVERRIDE;
+    QString documentationFilePath() const Q_DECL_OVERRIDE;
-    void createDocumentationFile() const QTC_OVERRIDE;
+    void createDocumentationFile() const Q_DECL_OVERRIDE;
 
 private slots:
     void helperSetVersion();

src/plugins/beautifier/beautifierplugin.h

@@ -33,7 +33,6 @@
 #include "command.h"
 
 #include <extensionsystem/iplugin.h>
-#include <utils/qtcoverride.h>
 
 #include <QFutureInterface>
 #include <QPlainTextEdit>
@@ -73,9 +72,9 @@ class BeautifierPlugin : public ExtensionSystem::IPlugin
 public:
     BeautifierPlugin();
     ~BeautifierPlugin();
-    bool initialize(const QStringList &arguments, QString *errorString) QTC_OVERRIDE;
+    bool initialize(const QStringList &arguments, QString *errorString) Q_DECL_OVERRIDE;
-    void extensionsInitialized() QTC_OVERRIDE;
+    void extensionsInitialized() Q_DECL_OVERRIDE;
-    ShutdownFlag aboutToShutdown() QTC_OVERRIDE;
+    ShutdownFlag aboutToShutdown() Q_DECL_OVERRIDE;
 
     QString format(const QString &text, const Command &command, const QString &fileName,
                    bool *timeout = 0);

src/plugins/beautifier/clangformat/clangformat.h

@@ -33,7 +33,6 @@
 #include "../beautifierabstracttool.h"
 #include "../command.h"
 
-#include <utils/qtcoverride.h>
 
 QT_FORWARD_DECLARE_CLASS(QAction)
 
@@ -53,9 +52,9 @@ class ClangFormat : public BeautifierAbstractTool
 public:
     explicit ClangFormat(BeautifierPlugin *parent = 0);
     virtual ~ClangFormat();
-    bool initialize() QTC_OVERRIDE;
+    bool initialize() Q_DECL_OVERRIDE;
-    void updateActions(Core::IEditor *editor) QTC_OVERRIDE;
+    void updateActions(Core::IEditor *editor) Q_DECL_OVERRIDE;
-    QList<QObject *> autoReleaseObjects() QTC_OVERRIDE;
+    QList<QObject *> autoReleaseObjects() Q_DECL_OVERRIDE;
 
 private slots:
     void formatFile();

src/plugins/beautifier/clangformat/clangformatoptionspage.h

@@ -31,7 +31,6 @@
 #define BEAUTIFIER_CLANGFORMATOPTIONSPAGE_H
 
 #include <coreplugin/dialogs/ioptionspage.h>
-#include <utils/qtcoverride.h>
 
 #include <QPointer>
 #include <QWidget>
@@ -65,9 +64,9 @@ class ClangFormatOptionsPage : public Core::IOptionsPage
 
 public:
     explicit ClangFormatOptionsPage(ClangFormatSettings *settings, QObject *parent = 0);
-    QWidget *widget() QTC_OVERRIDE;
+    QWidget *widget() Q_DECL_OVERRIDE;
-    void apply() QTC_OVERRIDE;
+    void apply() Q_DECL_OVERRIDE;
-    void finish() QTC_OVERRIDE;
+    void finish() Q_DECL_OVERRIDE;
 
 private:
     QPointer<ClangFormatOptionsPageWidget> m_widget;

src/plugins/beautifier/clangformat/clangformatsettings.h

@@ -32,7 +32,6 @@
 
 #include "../abstractsettings.h"
 
-#include <utils/qtcoverride.h>
 
 namespace Beautifier {
 namespace Internal {
@@ -45,9 +44,9 @@ class ClangFormatSettings : public AbstractSettings
 public:
     explicit ClangFormatSettings();
 
-    QString documentationFilePath() const QTC_OVERRIDE;
+    QString documentationFilePath() const Q_DECL_OVERRIDE;
-    void createDocumentationFile() const QTC_OVERRIDE;
+    void createDocumentationFile() const Q_DECL_OVERRIDE;
-    QStringList completerWords() QTC_OVERRIDE;
+    QStringList completerWords() Q_DECL_OVERRIDE;
 
     bool usePredefinedStyle() const;
     void setUsePredefinedStyle(bool usePredefinedStyle);

src/plugins/beautifier/configurationeditor.h

@@ -30,7 +30,6 @@
 #ifndef BEAUTIFIER_CONFIGURATIONEDITOR_H
 #define BEAUTIFIER_CONFIGURATIONEDITOR_H
 
-#include <utils/qtcoverride.h>
 
 #include <QPlainTextEdit>
 #include <QRegExp>
@@ -61,7 +60,7 @@ public:
     void setCommentExpression(const QRegExp &rx);
 
 protected:
-    void highlightBlock(const QString &text) QTC_OVERRIDE;
+    void highlightBlock(const QString &text) Q_DECL_OVERRIDE;
 
 private:
     QRegExp m_expressionKeyword;
@@ -80,8 +79,8 @@ public:
     void setCommentExpression(const QRegExp &rx);
 
 protected:
-    bool eventFilter(QObject *object, QEvent *event) QTC_OVERRIDE;
+    bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE;
-    void keyPressEvent(QKeyEvent *event) QTC_OVERRIDE;
+    void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
 
 private slots:
     void insertCompleterText(const QString &text);

src/plugins/beautifier/uncrustify/uncrustify.h

@@ -32,7 +32,6 @@
 
 #include "../beautifierabstracttool.h"
 
-#include <utils/qtcoverride.h>
 
 QT_FORWARD_DECLARE_CLASS(QAction)
 
@@ -52,9 +51,9 @@ class Uncrustify : public BeautifierAbstractTool
 public:
     explicit Uncrustify(BeautifierPlugin *parent = 0);
     virtual ~Uncrustify();
-    bool initialize() QTC_OVERRIDE;
+    bool initialize() Q_DECL_OVERRIDE;
-    void updateActions(Core::IEditor *editor) QTC_OVERRIDE;
+    void updateActions(Core::IEditor *editor) Q_DECL_OVERRIDE;
-    QList<QObject *> autoReleaseObjects() QTC_OVERRIDE;
+    QList<QObject *> autoReleaseObjects() Q_DECL_OVERRIDE;
 
 private slots:
     void formatFile();

src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h

@@ -31,7 +31,6 @@
 #define BEAUTIFIER_UNCRUSTIFYOPTIONSPAGE_H
 
 #include <coreplugin/dialogs/ioptionspage.h>
-#include <utils/qtcoverride.h>
 
 #include <QPointer>
 #include <QWidget>
@@ -65,9 +64,9 @@ class UncrustifyOptionsPage : public Core::IOptionsPage
 
 public:
     explicit UncrustifyOptionsPage(UncrustifySettings *settings, QObject *parent = 0);
-    QWidget *widget() QTC_OVERRIDE;
+    QWidget *widget() Q_DECL_OVERRIDE;
-    void apply() QTC_OVERRIDE;
+    void apply() Q_DECL_OVERRIDE;
-    void finish() QTC_OVERRIDE;
+    void finish() Q_DECL_OVERRIDE;
 
 private:
     QPointer<UncrustifyOptionsPageWidget> m_widget;

src/plugins/beautifier/uncrustify/uncrustifysettings.h

@@ -32,7 +32,6 @@
 
 #include "../abstractsettings.h"
 
-#include <utils/qtcoverride.h>
 
 namespace Beautifier {
 namespace Internal {
@@ -55,8 +54,8 @@ public:
     QString customStyle() const;
     void setCustomStyle(const QString &customStyle);
 
-    QString documentationFilePath() const QTC_OVERRIDE;
+    QString documentationFilePath() const Q_DECL_OVERRIDE;
-    void createDocumentationFile() const QTC_OVERRIDE;
+    void createDocumentationFile() const Q_DECL_OVERRIDE;
 };
 
 } // namespace Uncrustify

src/plugins/clangcodemodel/clangeditordocumentparser.h

@@ -35,7 +35,6 @@
 
 #include <cpptools/baseeditordocumentparser.h>
 
-#include <utils/qtcoverride.h>
 
 namespace CppTools { class WorkingCopy; }
 
@@ -51,7 +50,7 @@ public:
 public:
     ClangEditorDocumentParser(const QString &filePath);
 
-    void update(CppTools::WorkingCopy workingCopy) QTC_OVERRIDE;
+    void update(CppTools::WorkingCopy workingCopy) Q_DECL_OVERRIDE;
 
     QList<Diagnostic> diagnostics() const;
     QList<SemanticMarker::Range> ifdefedOutBlocks() const;

src/plugins/clangcodemodel/clangeditordocumentprocessor.h

@@ -36,7 +36,6 @@
 #include <cpptools/builtineditordocumentprocessor.h>
 #include <cpptools/semantichighlighter.h>
 
-#include <utils/qtcoverride.h>
 
 #include <QFutureWatcher>
 
@@ -51,11 +50,11 @@ public:
     ~ClangEditorDocumentProcessor();
 
     // BaseEditorDocumentProcessor interface
-    void run() QTC_OVERRIDE;
+    void run() Q_DECL_OVERRIDE;
-    void semanticRehighlight(bool force) QTC_OVERRIDE;
+    void semanticRehighlight(bool force) Q_DECL_OVERRIDE;
-    CppTools::SemanticInfo recalculateSemanticInfo() QTC_OVERRIDE;
+    CppTools::SemanticInfo recalculateSemanticInfo() Q_DECL_OVERRIDE;
-    CppTools::BaseEditorDocumentParser *parser() QTC_OVERRIDE;
+    CppTools::BaseEditorDocumentParser *parser() Q_DECL_OVERRIDE;
-    bool isParserRunning() const QTC_OVERRIDE;
+    bool isParserRunning() const Q_DECL_OVERRIDE;
 
 private slots:
     void onParserFinished();

src/plugins/cppeditor/cppeditor.h

@@ -34,7 +34,6 @@
 
 #include <texteditor/basetexteditor.h>
 
-#include <utils/qtcoverride.h>
 
 #include <QScopedPointer>
 
@@ -81,15 +80,15 @@ public:
 
     TextEditor::AssistInterface *createAssistInterface(
             TextEditor::AssistKind kind,
-            TextEditor::AssistReason reason) const QTC_OVERRIDE;
+            TextEditor::AssistReason reason) const Q_DECL_OVERRIDE;
 
     FollowSymbolUnderCursor *followSymbolUnderCursorDelegate(); // exposed for tests
-    TextEditor::CompletionAssistProvider *completionAssistProvider() const QTC_OVERRIDE;
+    TextEditor::CompletionAssistProvider *completionAssistProvider() const Q_DECL_OVERRIDE;
 
 public slots:
-    void paste() QTC_OVERRIDE;
+    void paste() Q_DECL_OVERRIDE;
-    void cut() QTC_OVERRIDE;
+    void cut() Q_DECL_OVERRIDE;
-    void selectAll() QTC_OVERRIDE;
+    void selectAll() Q_DECL_OVERRIDE;
 
     void switchDeclarationDefinition(bool inNextSplit);
     void showPreProcessorWidget();
@@ -99,22 +98,22 @@ public slots:
     void renameUsages(const QString &replacement = QString());
 
 protected:
-    bool event(QEvent *e) QTC_OVERRIDE;
+    bool event(QEvent *e) Q_DECL_OVERRIDE;
-    void contextMenuEvent(QContextMenuEvent *) QTC_OVERRIDE;
+    void contextMenuEvent(QContextMenuEvent *) Q_DECL_OVERRIDE;
-    void keyPressEvent(QKeyEvent *e) QTC_OVERRIDE;
+    void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE;
 
-    void applyFontSettings() QTC_OVERRIDE;
+    void applyFontSettings() Q_DECL_OVERRIDE;
 
-    bool openLink(const Link &link, bool inNextSplit) QTC_OVERRIDE
+    bool openLink(const Link &link, bool inNextSplit) Q_DECL_OVERRIDE
     { return openCppEditorAt(link, inNextSplit); }
 
     Link findLinkAt(const QTextCursor &, bool resolveTarget = true,
-                    bool inNextSplit = false) QTC_OVERRIDE;
+                    bool inNextSplit = false) Q_DECL_OVERRIDE;
 
-    void onRefactorMarkerClicked(const TextEditor::RefactorMarker &marker) QTC_OVERRIDE;
+    void onRefactorMarkerClicked(const TextEditor::RefactorMarker &marker) Q_DECL_OVERRIDE;
 
 protected slots:
-    void slotCodeStyleSettingsChanged(const QVariant &) QTC_OVERRIDE;
+    void slotCodeStyleSettingsChanged(const QVariant &) Q_DECL_OVERRIDE;
 
 private slots:
     void updateFunctionDeclDefLink();
@@ -138,8 +137,8 @@ private slots:
     void processKeyNormally(QKeyEvent *e);
 
 private:
-    void finalizeInitialization() QTC_OVERRIDE;
+    void finalizeInitialization() Q_DECL_OVERRIDE;
-    void finalizeInitializationAfterDuplication(BaseTextEditorWidget *other) QTC_OVERRIDE;
+    void finalizeInitializationAfterDuplication(BaseTextEditorWidget *other) Q_DECL_OVERRIDE;
 
     static bool openCppEditorAt(const Link &, bool inNextSplit = false);
 

src/plugins/cppeditor/cppquickfixassistant.h

@@ -37,7 +37,6 @@
 
 #include <cplusplus/LookupContext.h>
 
-#include <utils/qtcoverride.h>
 
 namespace CppTools {
 class CppRefactoringFile;
@@ -79,7 +78,7 @@ class CppQuickFixAssistProcessor : public TextEditor::QuickFixAssistProcessor
 public:
     CppQuickFixAssistProcessor(const TextEditor::IAssistProvider *provider);
 
-    const TextEditor::IAssistProvider *provider() const QTC_OVERRIDE;
+    const TextEditor::IAssistProvider *provider() const Q_DECL_OVERRIDE;
 
 private:
     const TextEditor::IAssistProvider *m_provider;
@@ -88,11 +87,11 @@ private:
 class CppQuickFixAssistProvider : public TextEditor::QuickFixAssistProvider
 {
 public:
-    bool isAsynchronous() const QTC_OVERRIDE;
+    bool isAsynchronous() const Q_DECL_OVERRIDE;
-    bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE;
+    bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE;
-    TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
+    TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE;
 
-    QList<TextEditor::QuickFixFactory *> quickFixFactories() const QTC_OVERRIDE;
+    QList<TextEditor::QuickFixFactory *> quickFixFactories() const Q_DECL_OVERRIDE;
 };
 
 } // Internal

src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp

@@ -53,7 +53,6 @@
 #include <texteditor/texteditorconstants.h>
 
 #include <utils/qtcassert.h>
-#include <utils/qtcoverride.h>
 
 using namespace CPlusPlus;
 using namespace CppEditor::Internal;
@@ -89,7 +88,7 @@ protected:
         return GenericProposalWidget::eventFilter(o, e);
     }
 
-    void showProposal(const QString &prefix) QTC_OVERRIDE
+    void showProposal(const QString &prefix) Q_DECL_OVERRIDE
     {
         GenericProposalModel *proposalModel = model();
         if (proposalModel && proposalModel->size() == 1) {
@@ -112,9 +111,9 @@ public:
         , m_openInSplit(openInSplit)
     {}
 
-    bool isFragile() const QTC_OVERRIDE { return true; }
+    bool isFragile() const Q_DECL_OVERRIDE { return true; }
 
-    IAssistProposalWidget *createWidget() const QTC_OVERRIDE
+    IAssistProposalWidget *createWidget() const Q_DECL_OVERRIDE
     { return new VirtualFunctionProposalWidget(m_openInSplit); }
 
 private:
@@ -128,7 +127,7 @@ public:
         : m_params(params)
     {}
 
-    IAssistProposal *immediateProposal(const TextEditor::AssistInterface *) QTC_OVERRIDE
+    IAssistProposal *immediateProposal(const TextEditor::AssistInterface *) Q_DECL_OVERRIDE
     {
         QTC_ASSERT(m_params.function, return 0);
 
@@ -143,7 +142,7 @@ public:
         return new VirtualFunctionProposal(m_params.cursorPosition, items, m_params.openInNextSplit);
     }
 
-    IAssistProposal *perform(const AssistInterface *assistInterface) QTC_OVERRIDE
+    IAssistProposal *perform(const AssistInterface *assistInterface) Q_DECL_OVERRIDE
     {
         delete assistInterface;
 

src/plugins/cppeditor/cppvirtualfunctionassistprovider.h

@@ -36,7 +36,6 @@
 #include <cplusplus/Symbols.h>
 #include <cplusplus/TypeOfExpression.h>
 
-#include <utils/qtcoverride.h>
 
 #include <QSharedPointer>
 #include <QTextCursor>
@@ -64,9 +63,9 @@ public:
     Parameters params() const { return m_params; }
     void clearParams() { m_params = Parameters(); }
 
-    bool isAsynchronous() const QTC_OVERRIDE;
+    bool isAsynchronous() const Q_DECL_OVERRIDE;
-    bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE;
+    bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE;
-    TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
+    TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE;
 
 private:
     Parameters m_params;

src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp

@@ -121,7 +121,7 @@ public:
     // Invoke the processor already here to calculate the proposals. Return false in order to
     // indicate that configure failed, so the actual code assist invocation leading to a pop-up
     // will not happen.
-    bool configure(const VirtualFunctionAssistProvider::Parameters &params) QTC_OVERRIDE
+    bool configure(const VirtualFunctionAssistProvider::Parameters &params) Q_DECL_OVERRIDE
     {
         VirtualFunctionAssistProvider::configure(params);
 

src/plugins/cpptools/builtineditordocumentparser.h

@@ -35,7 +35,6 @@
 #include "cppmodelmanager.h"
 
 #include <cplusplus/CppDocument.h>
-#include <utils/qtcoverride.h>
 
 #include <QMutex>
 #include <QString>
@@ -49,7 +48,7 @@ class CPPTOOLS_EXPORT BuiltinEditorDocumentParser : public BaseEditorDocumentPar
 public:
     BuiltinEditorDocumentParser(const QString &filePath);
 
-    void update(WorkingCopy workingCopy) QTC_OVERRIDE;
+    void update(WorkingCopy workingCopy) Q_DECL_OVERRIDE;
     void releaseResources();
 
     CPlusPlus::Document::Ptr document() const;

src/plugins/cpptools/builtineditordocumentprocessor.h

@@ -36,7 +36,6 @@
 #include "cpptools_global.h"
 #include "semantichighlighter.h"
 
-#include <utils/qtcoverride.h>
 
 namespace CppTools {
 
@@ -51,11 +50,11 @@ public:
     ~BuiltinEditorDocumentProcessor();
 
     // BaseEditorDocumentProcessor interface
-    void run() QTC_OVERRIDE;
+    void run() Q_DECL_OVERRIDE;
-    void semanticRehighlight(bool force) QTC_OVERRIDE;
+    void semanticRehighlight(bool force) Q_DECL_OVERRIDE;
-    CppTools::SemanticInfo recalculateSemanticInfo() QTC_OVERRIDE;
+    CppTools::SemanticInfo recalculateSemanticInfo() Q_DECL_OVERRIDE;
-    BaseEditorDocumentParser *parser() QTC_OVERRIDE;
+    BaseEditorDocumentParser *parser() Q_DECL_OVERRIDE;
-    bool isParserRunning() const QTC_OVERRIDE;
+    bool isParserRunning() const Q_DECL_OVERRIDE;
 
 private:
     void onParserFinished(CPlusPlus::Document::Ptr document, CPlusPlus::Snapshot snapshot);

src/plugins/cpptools/cppclassesfilter.h

@@ -34,7 +34,6 @@
 #include "cpplocatordata.h"
 #include "cpplocatorfilter.h"
 
-#include <utils/qtcoverride.h>
 
 namespace CppTools {
 
@@ -48,8 +47,8 @@ public:
     ~CppClassesFilter();
 
 protected:
-    IndexItem::ItemType matchTypes() const QTC_OVERRIDE { return IndexItem::Class; }
+    IndexItem::ItemType matchTypes() const Q_DECL_OVERRIDE { return IndexItem::Class; }
-    Core::LocatorFilterEntry filterEntryFromIndexItem(IndexItem::Ptr info) QTC_OVERRIDE;
+    Core::LocatorFilterEntry filterEntryFromIndexItem(IndexItem::Ptr info) Q_DECL_OVERRIDE;
 };
 
 } // namespace CppTools

src/plugins/cpptools/cppcompletionassist.cpp

@@ -49,7 +49,6 @@
 #include <texteditor/completionsettings.h>
 
 #include <utils/qtcassert.h>
-#include <utils/qtcoverride.h>
 
 #include <cplusplus/BackwardsScanner.h>
 #include <cplusplus/CppRewriter.h>
@@ -90,8 +89,8 @@ public:
     CppAssistProposalItem() :
         m_isOverloaded(false) {}
 
-    bool prematurelyApplies(const QChar &c) const QTC_OVERRIDE;
+    bool prematurelyApplies(const QChar &c) const Q_DECL_OVERRIDE;
-    void applyContextualContent(BaseTextEditorWidget *editorWidget, int basePosition) const QTC_OVERRIDE;
+    void applyContextualContent(BaseTextEditorWidget *editorWidget, int basePosition) const Q_DECL_OVERRIDE;
 
     bool isOverloaded() const { return m_isOverloaded; }
     void markAsOverloaded() { m_isOverloaded = true; }
@@ -350,10 +349,10 @@ public:
         , m_typeOfExpression(typeOfExp)
     {}
 
-    void reset() QTC_OVERRIDE {}
+    void reset() Q_DECL_OVERRIDE {}
-    int size() const QTC_OVERRIDE { return m_functionSymbols.size(); }
+    int size() const Q_DECL_OVERRIDE { return m_functionSymbols.size(); }
-    QString text(int index) const QTC_OVERRIDE;
+    QString text(int index) const Q_DECL_OVERRIDE;
-    int activeArgument(const QString &prefix) const QTC_OVERRIDE;
+    int activeArgument(const QString &prefix) const Q_DECL_OVERRIDE;
 
 private:
     QList<Function *> m_functionSymbols;
@@ -439,8 +438,8 @@ public:
         , m_replaceDotForArrow(static_cast<CppAssistProposalModel *>(model)->m_replaceDotForArrow)
     {}
 
-    bool isCorrective() const QTC_OVERRIDE { return m_replaceDotForArrow; }
+    bool isCorrective() const Q_DECL_OVERRIDE { return m_replaceDotForArrow; }
-    void makeCorrection(BaseTextEditorWidget *editorWidget) QTC_OVERRIDE;
+    void makeCorrection(BaseTextEditorWidget *editorWidget) Q_DECL_OVERRIDE;
 
 private:
     bool m_replaceDotForArrow;

src/plugins/cpptools/cppcompletionassist.h

@@ -44,7 +44,6 @@
 #include <texteditor/codeassist/iassistprocessor.h>
 #include <texteditor/snippets/snippetassistcollector.h>
 
-#include <utils/qtcoverride.h>
 
 #include <QStringList>
 #include <QVariant>
@@ -73,8 +72,8 @@ public:
         m_typeOfExpression->setExpandTemplates(true);
     }
 
-    bool isSortable(const QString &prefix) const QTC_OVERRIDE;
+    bool isSortable(const QString &prefix) const Q_DECL_OVERRIDE;
-    TextEditor::AssistProposalItem *proposalItem(int index) const QTC_OVERRIDE;
+    TextEditor::AssistProposalItem *proposalItem(int index) const Q_DECL_OVERRIDE;
 
     unsigned m_completionOperator;
     bool m_replaceDotForArrow;
@@ -86,14 +85,14 @@ class InternalCompletionAssistProvider : public CppCompletionAssistProvider
     Q_OBJECT
 
 public:
-    TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
+    TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE;
 
     TextEditor::AssistInterface *createAssistInterface(
             const QString &filePath,
             QTextDocument *document,
             bool isObjCEnabled,
             int position,
-            TextEditor::AssistReason reason) const QTC_OVERRIDE;
+            TextEditor::AssistReason reason) const Q_DECL_OVERRIDE;
 };
 
 class CppCompletionAssistProcessor : public TextEditor::IAssistProcessor
@@ -102,7 +101,7 @@ public:
     CppCompletionAssistProcessor();
     ~CppCompletionAssistProcessor();
 
-    TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) QTC_OVERRIDE;
+    TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) Q_DECL_OVERRIDE;
 
 private:
     TextEditor::IAssistProposal *createContentProposal();

src/plugins/cpptools/cppcompletionassistprovider.h

@@ -35,7 +35,6 @@
 #include <texteditor/codeassist/assistenums.h>
 #include <texteditor/codeassist/completionassistprovider.h>
 
-#include <utils/qtcoverride.h>
 
 QT_BEGIN_NAMESPACE
 class QTextDocument;
@@ -53,10 +52,10 @@ class CPPTOOLS_EXPORT CppCompletionAssistProvider : public TextEditor::Completio
     Q_OBJECT
 
 public:
-    bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE;
+    bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE;
-    int activationCharSequenceLength() const QTC_OVERRIDE;
+    int activationCharSequenceLength() const Q_DECL_OVERRIDE;
-    bool isActivationCharSequence(const QString &sequence) const QTC_OVERRIDE;
+    bool isActivationCharSequence(const QString &sequence) const Q_DECL_OVERRIDE;
-    bool isContinuationChar(const QChar &c) const QTC_OVERRIDE;
+    bool isContinuationChar(const QChar &c) const Q_DECL_OVERRIDE;
 
     virtual TextEditor::AssistInterface *createAssistInterface(
             const QString &filePath,

src/plugins/cpptools/cppfunctionsfilter.h

@@ -33,7 +33,6 @@
 #include "cpplocatordata.h"
 #include "cpplocatorfilter.h"
 
-#include <utils/qtcoverride.h>
 
 namespace CppTools {
 namespace Internal {
@@ -47,8 +46,8 @@ public:
     ~CppFunctionsFilter();
 
 protected:
-    IndexItem::ItemType matchTypes() const QTC_OVERRIDE { return IndexItem::Function; }
+    IndexItem::ItemType matchTypes() const Q_DECL_OVERRIDE { return IndexItem::Function; }
-    Core::LocatorFilterEntry filterEntryFromIndexItem(IndexItem::Ptr info) QTC_OVERRIDE;
+    Core::LocatorFilterEntry filterEntryFromIndexItem(IndexItem::Ptr info) Q_DECL_OVERRIDE;
 };
 
 } // namespace Internal

src/plugins/cpptools/cppsemanticinfoupdater.cpp

@@ -32,7 +32,6 @@
 #include "cpplocalsymbols.h"
 
 #include <utils/qtcassert.h>
-#include <utils/qtcoverride.h>
 #include <utils/runextensions.h>
 
 #include <cplusplus/Control.h>

src/plugins/cpptools/cppsourceprocessor.h

@@ -35,7 +35,6 @@
 
 #include <cplusplus/PreprocessorEnvironment.h>
 #include <cplusplus/pp-engine.h>
-#include <utils/qtcoverride.h>
 
 #include <QHash>
 #include <QPointer>
@@ -96,22 +95,22 @@ private:
     void mergeEnvironment(CPlusPlus::Document::Ptr doc);
 
     // Client interface
-    void macroAdded(const CPlusPlus::Macro &macro) QTC_OVERRIDE;
+    void macroAdded(const CPlusPlus::Macro &macro) Q_DECL_OVERRIDE;
     void passedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charsOffset,
-                                    unsigned line, const CPlusPlus::Macro &macro) QTC_OVERRIDE;
+                                    unsigned line, const CPlusPlus::Macro &macro) Q_DECL_OVERRIDE;
     void failedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charOffset,
-                                    const CPlusPlus::ByteArrayRef &name) QTC_OVERRIDE;
+                                    const CPlusPlus::ByteArrayRef &name) Q_DECL_OVERRIDE;
     void notifyMacroReference(unsigned bytesOffset, unsigned utf16charOffset,
-                              unsigned line, const CPlusPlus::Macro &macro) QTC_OVERRIDE;
+                              unsigned line, const CPlusPlus::Macro &macro) Q_DECL_OVERRIDE;
     void startExpandingMacro(unsigned bytesOffset, unsigned utf16charOffset,
                              unsigned line, const CPlusPlus::Macro &macro,
-                             const QVector<CPlusPlus::MacroArgumentReference> &actuals) QTC_OVERRIDE;
+                             const QVector<CPlusPlus::MacroArgumentReference> &actuals) Q_DECL_OVERRIDE;
-    void stopExpandingMacro(unsigned bytesOffset, const CPlusPlus::Macro &macro) QTC_OVERRIDE;
+    void stopExpandingMacro(unsigned bytesOffset, const CPlusPlus::Macro &macro) Q_DECL_OVERRIDE;
-    void markAsIncludeGuard(const QByteArray &macroName) QTC_OVERRIDE;
+    void markAsIncludeGuard(const QByteArray &macroName) Q_DECL_OVERRIDE;
-    void startSkippingBlocks(unsigned utf16charsOffset) QTC_OVERRIDE;
+    void startSkippingBlocks(unsigned utf16charsOffset) Q_DECL_OVERRIDE;
-    void stopSkippingBlocks(unsigned utf16charsOffset) QTC_OVERRIDE;
+    void stopSkippingBlocks(unsigned utf16charsOffset) Q_DECL_OVERRIDE;
     void sourceNeeded(unsigned line, const QString &fileName, IncludeType type,
-                      const QStringList &initialIncludes) QTC_OVERRIDE;
+                      const QStringList &initialIncludes) Q_DECL_OVERRIDE;
 
 private:
     CPlusPlus::Snapshot m_snapshot;

src/plugins/fakevim/fakevimplugin.cpp

@@ -76,7 +76,6 @@
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
 #include <utils/pathchooser.h>
-#include <utils/qtcoverride.h>
 #include <utils/savedaction.h>
 #include <utils/stylehelper.h>
 
@@ -888,18 +887,18 @@ public:
         : m_provider(const_cast<FakeVimCompletionAssistProvider *>(provider))
     {}
 
-    bool implicitlyApplies() const QTC_OVERRIDE
+    bool implicitlyApplies() const Q_DECL_OVERRIDE
     {
         return false;
     }
 
-    bool prematurelyApplies(const QChar &c) const QTC_OVERRIDE
+    bool prematurelyApplies(const QChar &c) const Q_DECL_OVERRIDE
     {
         m_provider->appendNeedle(c);
         return text() == m_provider->needle();
     }
 
-    void applyContextualContent(BaseTextEditorWidget *, int) const QTC_OVERRIDE
+    void applyContextualContent(BaseTextEditorWidget *, int) const Q_DECL_OVERRIDE
     {
         QTC_ASSERT(m_provider->handler(), return);
         m_provider->handler()->handleReplay(text().mid(m_provider->needle().size()));
@@ -919,7 +918,7 @@ public:
         loadContent(items);
     }
 
-    bool supportsPrefixExpansion() const QTC_OVERRIDE
+    bool supportsPrefixExpansion() const Q_DECL_OVERRIDE
     {
         return false;
     }
@@ -932,7 +931,7 @@ public:
         : m_provider(static_cast<const FakeVimCompletionAssistProvider *>(provider))
     {}
 
-    IAssistProposal *perform(const AssistInterface *interface) QTC_OVERRIDE
+    IAssistProposal *perform(const AssistInterface *interface) Q_DECL_OVERRIDE
     {
         const QString &needle = m_provider->needle();
 

src/plugins/glsleditor/glslcompletionassist.cpp

@@ -47,7 +47,6 @@
 #include <cplusplus/ExpressionUnderCursor.h>
 
 #include <utils/faketooltip.h>
-#include <utils/qtcoverride.h>
 
 #include <QIcon>
 #include <QPainter>
@@ -177,10 +176,10 @@ public:
         , m_currentArg(-1)
     {}
 
-    void reset() QTC_OVERRIDE {}
+    void reset() Q_DECL_OVERRIDE {}
-    int size() const QTC_OVERRIDE { return m_items.size(); }
+    int size() const Q_DECL_OVERRIDE { return m_items.size(); }
-    QString text(int index) const QTC_OVERRIDE;
+    QString text(int index) const Q_DECL_OVERRIDE;
-    int activeArgument(const QString &prefix) const QTC_OVERRIDE;
+    int activeArgument(const QString &prefix) const Q_DECL_OVERRIDE;
 
 private:
     QVector<GLSL::Function *> m_items;

src/plugins/glsleditor/glslcompletionassist.h

@@ -37,7 +37,6 @@
 #include <texteditor/codeassist/assistinterface.h>
 #include <texteditor/codeassist/ifunctionhintproposalmodel.h>
 
-#include <utils/qtcoverride.h>
 
 #include <QIcon>
 #include <QScopedPointer>
@@ -91,11 +90,11 @@ class GlslCompletionAssistProvider : public TextEditor::CompletionAssistProvider
     Q_OBJECT
 
 public:
-    bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE;
+    bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE;
-    TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
+    TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE;
 
-    int activationCharSequenceLength() const QTC_OVERRIDE;
+    int activationCharSequenceLength() const Q_DECL_OVERRIDE;
-    bool isActivationCharSequence(const QString &sequence) const QTC_OVERRIDE;
+    bool isActivationCharSequence(const QString &sequence) const Q_DECL_OVERRIDE;
 };
 
 class GlslCompletionAssistProcessor : public TextEditor::IAssistProcessor
@@ -104,7 +103,7 @@ public:
     GlslCompletionAssistProcessor();
     ~GlslCompletionAssistProcessor();
 
-    TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) QTC_OVERRIDE;
+    TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) Q_DECL_OVERRIDE;
 
 private:
     TextEditor::IAssistProposal *createHintProposal(const QVector<GLSL::Function *> &symbols);

src/plugins/ios/iosbuildstep.h

@@ -30,7 +30,6 @@
 #define IOSBUILDSTEP_H
 
 #include <projectexplorer/abstractprocessstep.h>
-#include <utils/qtcoverride.h>
 
 QT_BEGIN_NAMESPACE
 class QListWidgetItem;
@@ -54,11 +53,11 @@ public:
     IosBuildStep(ProjectExplorer::BuildStepList *parent);
     ~IosBuildStep();
 
-    bool init() QTC_OVERRIDE;
+    bool init() Q_DECL_OVERRIDE;
-    void run(QFutureInterface<bool> &fi) QTC_OVERRIDE;
+    void run(QFutureInterface<bool> &fi) Q_DECL_OVERRIDE;
 
-    ProjectExplorer::BuildStepConfigWidget *createConfigWidget() QTC_OVERRIDE;
+    ProjectExplorer::BuildStepConfigWidget *createConfigWidget() Q_DECL_OVERRIDE;
-    bool immutable() const QTC_OVERRIDE;
+    bool immutable() const Q_DECL_OVERRIDE;
     void setBaseArguments(const QStringList &args);
     void setExtraArguments(const QStringList &extraArgs);
     QStringList baseArguments() const;
@@ -69,11 +68,11 @@ public:
     void setClean(bool clean);
     bool isClean() const;
 
-    QVariantMap toMap() const QTC_OVERRIDE;
+    QVariantMap toMap() const Q_DECL_OVERRIDE;
 protected:
     IosBuildStep(ProjectExplorer::BuildStepList *parent, IosBuildStep *bs);
     IosBuildStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
-    bool fromMap(const QVariantMap &map) QTC_OVERRIDE;
+    bool fromMap(const QVariantMap &map) Q_DECL_OVERRIDE;
 
 private:
     void ctor();
@@ -92,8 +91,8 @@ class IosBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
 public:
     IosBuildStepConfigWidget(IosBuildStep *buildStep);
     ~IosBuildStepConfigWidget();
-    QString displayName() const QTC_OVERRIDE;
+    QString displayName() const Q_DECL_OVERRIDE;
-    QString summaryText() const QTC_OVERRIDE;
+    QString summaryText() const Q_DECL_OVERRIDE;
 
 private slots:
     void buildArgumentsChanged();
@@ -114,18 +113,18 @@ class IosBuildStepFactory : public ProjectExplorer::IBuildStepFactory
 public:
     explicit IosBuildStepFactory(QObject *parent = 0);
 
-    bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const QTC_OVERRIDE;
+    bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const Q_DECL_OVERRIDE;
-    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) QTC_OVERRIDE;
+    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) Q_DECL_OVERRIDE;
     bool canClone(ProjectExplorer::BuildStepList *parent,
-                  ProjectExplorer::BuildStep *source) const QTC_OVERRIDE;
+                  ProjectExplorer::BuildStep *source) const Q_DECL_OVERRIDE;
     ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent,
-                                      ProjectExplorer::BuildStep *source) QTC_OVERRIDE;
+                                      ProjectExplorer::BuildStep *source) Q_DECL_OVERRIDE;
-    bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const QTC_OVERRIDE;
+    bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const Q_DECL_OVERRIDE;
     ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent,
-                                        const QVariantMap &map) QTC_OVERRIDE;
+                                        const QVariantMap &map) Q_DECL_OVERRIDE;
 
-    QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const QTC_OVERRIDE;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const Q_DECL_OVERRIDE;
-    QString displayNameForId(Core::Id id) const QTC_OVERRIDE;
+    QString displayNameForId(Core::Id id) const Q_DECL_OVERRIDE;
 };
 
 } // namespace Internal

src/plugins/ios/iosdeployconfiguration.h

@@ -30,7 +30,6 @@
 #define IOSDEPLOYCONFIGURATION_H
 
 #include <projectexplorer/deployconfiguration.h>
-#include <utils/qtcoverride.h>
 
 namespace Ios {
 namespace Internal {
@@ -59,22 +58,22 @@ class IosDeployConfigurationFactory : public ProjectExplorer::DeployConfiguratio
 public:
     explicit IosDeployConfigurationFactory(QObject *parent = 0);
 
-    bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const QTC_OVERRIDE;
+    bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const Q_DECL_OVERRIDE;
-    ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id) QTC_OVERRIDE;
+    ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id) Q_DECL_OVERRIDE;
-    bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const QTC_OVERRIDE;
+    bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const Q_DECL_OVERRIDE;
     ProjectExplorer::DeployConfiguration *restore(ProjectExplorer::Target *parent,
-                                                  const QVariantMap &map) QTC_OVERRIDE;
+                                                  const QVariantMap &map) Q_DECL_OVERRIDE;
     bool canClone(ProjectExplorer::Target *parent,
-                  ProjectExplorer::DeployConfiguration *source) const QTC_OVERRIDE;
+                  ProjectExplorer::DeployConfiguration *source) const Q_DECL_OVERRIDE;
     ProjectExplorer::DeployConfiguration *clone(ProjectExplorer::Target *parent,
-                                                ProjectExplorer::DeployConfiguration *source) QTC_OVERRIDE;
+                                                ProjectExplorer::DeployConfiguration *source) Q_DECL_OVERRIDE;
 
-    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const QTC_OVERRIDE;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const Q_DECL_OVERRIDE;
     // used to translate the ids to names to display to the user
-    QString displayNameForId(Core::Id id) const QTC_OVERRIDE;
+    QString displayNameForId(Core::Id id) const Q_DECL_OVERRIDE;
 
 private:
-    bool canHandle(ProjectExplorer::Target *parent) const QTC_OVERRIDE;
+    bool canHandle(ProjectExplorer::Target *parent) const Q_DECL_OVERRIDE;
 };
 
 } // namespace Internal

src/plugins/ios/iosdeploystep.h

@@ -36,7 +36,6 @@
 #include <projectexplorer/buildstep.h>
 #include <projectexplorer/devicesupport/idevice.h>
 #include <qtsupport/baseqtversion.h>
-#include <utils/qtcoverride.h>
 
 #include <QFutureInterface>
 #include <QProcess>
@@ -68,10 +67,10 @@ public:
 
     ~IosDeployStep();
 
-    bool fromMap(const QVariantMap &map) QTC_OVERRIDE;
+    bool fromMap(const QVariantMap &map) Q_DECL_OVERRIDE;
-    QVariantMap toMap() const QTC_OVERRIDE;
+    QVariantMap toMap() const Q_DECL_OVERRIDE;
 
-    void run(QFutureInterface<bool> &fi) QTC_OVERRIDE;
+    void run(QFutureInterface<bool> &fi) Q_DECL_OVERRIDE;
     void cleanup();
     void cancel();
 signals:
@@ -90,10 +89,10 @@ private slots:
 private:
     IosDeployStep(ProjectExplorer::BuildStepList *bc,
         IosDeployStep *other);
-    bool init() QTC_OVERRIDE;
+    bool init() Q_DECL_OVERRIDE;
-    ProjectExplorer::BuildStepConfigWidget *createConfigWidget() QTC_OVERRIDE;
+    ProjectExplorer::BuildStepConfigWidget *createConfigWidget() Q_DECL_OVERRIDE;
-    bool immutable() const QTC_OVERRIDE { return true; }
+    bool immutable() const Q_DECL_OVERRIDE { return true; }
-    bool runInGuiThread() const QTC_OVERRIDE { return true; }
+    bool runInGuiThread() const Q_DECL_OVERRIDE { return true; }
     ProjectExplorer::IDevice::ConstPtr device() const;
     IosDevice::ConstPtr iosdevice() const;
     IosSimulator::ConstPtr iossimulator() const;

src/plugins/ios/iosdeploystepfactory.h

@@ -30,7 +30,6 @@
 #define IOSDEPLOYSTEPFACTORY_H
 
 #include <projectexplorer/buildstep.h>
-#include <utils/qtcoverride.h>
 
 namespace Ios {
 namespace Internal {
@@ -41,20 +40,20 @@ class IosDeployStepFactory : public ProjectExplorer::IBuildStepFactory
 public:
     explicit IosDeployStepFactory(QObject *parent = 0);
 
-    QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const QTC_OVERRIDE;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const Q_DECL_OVERRIDE;
-    QString displayNameForId(Core::Id id) const QTC_OVERRIDE;
+    QString displayNameForId(Core::Id id) const Q_DECL_OVERRIDE;
 
     bool canCreate(ProjectExplorer::BuildStepList *parent,
-                   Core::Id id) const QTC_OVERRIDE;
+                   Core::Id id) const Q_DECL_OVERRIDE;
-    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) QTC_OVERRIDE;
+    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) Q_DECL_OVERRIDE;
 
-    bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const QTC_OVERRIDE;
+    bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const Q_DECL_OVERRIDE;
-    ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) QTC_OVERRIDE;
+    ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) Q_DECL_OVERRIDE;
 
     bool canClone(ProjectExplorer::BuildStepList *parent,
-                  ProjectExplorer::BuildStep *product) const QTC_OVERRIDE;
+                  ProjectExplorer::BuildStep *product) const Q_DECL_OVERRIDE;
     ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent,
-                                      ProjectExplorer::BuildStep *product) QTC_OVERRIDE;
+                                      ProjectExplorer::BuildStep *product) Q_DECL_OVERRIDE;
 };
 
 } // namespace Internal

src/plugins/ios/iosdeploystepwidget.h

@@ -30,7 +30,6 @@
 #define IOSDEPLOYSTEPWIDGET_H
 
 #include <projectexplorer/buildstep.h>
-#include <utils/qtcoverride.h>
 
 QT_BEGIN_NAMESPACE
 namespace Ui { class IosDeployStepWidget; }
@@ -49,8 +48,8 @@ public:
     ~IosDeployStepWidget();
 
 private:
-    QString summaryText() const QTC_OVERRIDE;
+    QString summaryText() const Q_DECL_OVERRIDE;
-    QString displayName() const QTC_OVERRIDE;
+    QString displayName() const Q_DECL_OVERRIDE;
 
     Ui::IosDeployStepWidget *ui;
     IosDeployStep *m_step;

src/plugins/ios/iosdevice.h

@@ -32,7 +32,6 @@
 #include "iostoolhandler.h"
 
 #include <projectexplorer/devicesupport/idevice.h>
-#include <utils/qtcoverride.h>
 
 #include <QVariantMap>
 #include <QMap>
@@ -57,22 +56,22 @@ public:
     typedef QSharedPointer<const IosDevice> ConstPtr;
     typedef QSharedPointer<IosDevice> Ptr;
 
-    ProjectExplorer::IDevice::DeviceInfo deviceInformation() const QTC_OVERRIDE;
+    ProjectExplorer::IDevice::DeviceInfo deviceInformation() const Q_DECL_OVERRIDE;
-    ProjectExplorer::IDeviceWidget *createWidget() QTC_OVERRIDE;
+    ProjectExplorer::IDeviceWidget *createWidget() Q_DECL_OVERRIDE;
-    QList<Core::Id> actionIds() const QTC_OVERRIDE;
+    QList<Core::Id> actionIds() const Q_DECL_OVERRIDE;
-    QString displayNameForActionId(Core::Id actionId) const QTC_OVERRIDE;
+    QString displayNameForActionId(Core::Id actionId) const Q_DECL_OVERRIDE;
-    void executeAction(Core::Id actionId, QWidget *parent = 0) QTC_OVERRIDE;
+    void executeAction(Core::Id actionId, QWidget *parent = 0) Q_DECL_OVERRIDE;
-    ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const QTC_OVERRIDE;
+    ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const Q_DECL_OVERRIDE;
-    QString displayType() const QTC_OVERRIDE;
+    QString displayType() const Q_DECL_OVERRIDE;
 
-    ProjectExplorer::IDevice::Ptr clone() const QTC_OVERRIDE;
+    ProjectExplorer::IDevice::Ptr clone() const Q_DECL_OVERRIDE;
-    void fromMap(const QVariantMap &map) QTC_OVERRIDE;
+    void fromMap(const QVariantMap &map) Q_DECL_OVERRIDE;
-    QVariantMap toMap() const QTC_OVERRIDE;
+    QVariantMap toMap() const Q_DECL_OVERRIDE;
     QString uniqueDeviceID() const;
     IosDevice(const QString &uid);
     QString osVersion() const;
     quint16 nextPort() const;
-    bool canAutoDetectPorts() const QTC_OVERRIDE;
+    bool canAutoDetectPorts() const Q_DECL_OVERRIDE;
 
     static QString name();
 

src/plugins/ios/iosdevicefactory.h

@@ -30,7 +30,6 @@
 #define IOSDEVICEFACTORY_H
 
 #include <projectexplorer/devicesupport/idevicefactory.h>
-#include <utils/qtcoverride.h>
 
 #include <QTimer>
 #include <QMap>
@@ -45,13 +44,13 @@ class IosDeviceFactory : public ProjectExplorer::IDeviceFactory
 public:
     IosDeviceFactory();
 
-    QString displayNameForId(Core::Id type) const QTC_OVERRIDE;
+    QString displayNameForId(Core::Id type) const Q_DECL_OVERRIDE;
-    QList<Core::Id> availableCreationIds() const QTC_OVERRIDE;
+    QList<Core::Id> availableCreationIds() const Q_DECL_OVERRIDE;
 
-    bool canCreate() const QTC_OVERRIDE;
+    bool canCreate() const Q_DECL_OVERRIDE;
-    ProjectExplorer::IDevice::Ptr create(Core::Id id) const QTC_OVERRIDE;
+    ProjectExplorer::IDevice::Ptr create(Core::Id id) const Q_DECL_OVERRIDE;
-    bool canRestore(const QVariantMap &map) const QTC_OVERRIDE;
+    bool canRestore(const QVariantMap &map) const Q_DECL_OVERRIDE;
-    ProjectExplorer::IDevice::Ptr restore(const QVariantMap &map) const QTC_OVERRIDE;
+    ProjectExplorer::IDevice::Ptr restore(const QVariantMap &map) const Q_DECL_OVERRIDE;
 };
 
 } // namespace Internal

src/plugins/ios/iosdsymbuildstep.h

@@ -30,7 +30,6 @@
 #define IOSDSYMBUILDSTEP_H
 
 #include <projectexplorer/abstractprocessstep.h>
-#include <utils/qtcoverride.h>
 
 namespace Ios {
 namespace Internal {
@@ -49,11 +48,11 @@ class IosPresetBuildStep : public ProjectExplorer::AbstractProcessStep
 public:
     ~IosPresetBuildStep();
 
-    bool init() QTC_OVERRIDE;
+    bool init() Q_DECL_OVERRIDE;
-    void run(QFutureInterface<bool> &fi) QTC_OVERRIDE;
+    void run(QFutureInterface<bool> &fi) Q_DECL_OVERRIDE;
 
-    ProjectExplorer::BuildStepConfigWidget *createConfigWidget() QTC_OVERRIDE;
+    ProjectExplorer::BuildStepConfigWidget *createConfigWidget() Q_DECL_OVERRIDE;
-    bool immutable() const QTC_OVERRIDE;
+    bool immutable() const Q_DECL_OVERRIDE;
     void setArguments(const QStringList &args);
     QStringList arguments() const;
     QStringList defaultArguments() const;
@@ -64,12 +63,12 @@ public:
     void setClean(bool clean);
     bool isDefault() const;
 
-    QVariantMap toMap() const QTC_OVERRIDE;
+    QVariantMap toMap() const Q_DECL_OVERRIDE;
 protected:
     IosPresetBuildStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
     virtual bool completeSetup();
     virtual bool completeSetupWithStep(ProjectExplorer::BuildStep *bs);
-    bool fromMap(const QVariantMap &map) QTC_OVERRIDE;
+    bool fromMap(const QVariantMap &map) Q_DECL_OVERRIDE;
     virtual QStringList defaultCleanCmdList() const = 0;
     virtual QStringList defaultCmdList() const = 0;
 private:
@@ -85,8 +84,8 @@ class IosPresetBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWi
 public:
     IosPresetBuildStepConfigWidget(IosPresetBuildStep *buildStep);
     ~IosPresetBuildStepConfigWidget();
-    QString displayName() const QTC_OVERRIDE;
+    QString displayName() const Q_DECL_OVERRIDE;
-    QString summaryText() const QTC_OVERRIDE;
+    QString summaryText() const Q_DECL_OVERRIDE;
 
 private slots:
     void commandChanged();
@@ -107,14 +106,14 @@ class IosPresetBuildStepFactory : public ProjectExplorer::IBuildStepFactory
 public:
     explicit IosPresetBuildStepFactory(QObject *parent = 0);
 
-    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) QTC_OVERRIDE;
+    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) Q_DECL_OVERRIDE;
     bool canClone(ProjectExplorer::BuildStepList *parent,
-                  ProjectExplorer::BuildStep *source) const QTC_OVERRIDE;
+                  ProjectExplorer::BuildStep *source) const Q_DECL_OVERRIDE;
     ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent,
-                                      ProjectExplorer::BuildStep *source) QTC_OVERRIDE;
+                                      ProjectExplorer::BuildStep *source) Q_DECL_OVERRIDE;
-    bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const QTC_OVERRIDE;
+    bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const Q_DECL_OVERRIDE;
     ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent,
-                                        const QVariantMap &map) QTC_OVERRIDE;
+                                        const QVariantMap &map) Q_DECL_OVERRIDE;
 
 protected:
     virtual IosPresetBuildStep *createPresetStep(ProjectExplorer::BuildStepList *parent,
@@ -126,8 +125,8 @@ class IosDsymBuildStep : public IosPresetBuildStep
     Q_OBJECT
     friend class IosDsymBuildStepFactory;
 protected:
-    QStringList defaultCleanCmdList() const QTC_OVERRIDE;
+    QStringList defaultCleanCmdList() const Q_DECL_OVERRIDE;
-    QStringList defaultCmdList() const QTC_OVERRIDE;
+    QStringList defaultCmdList() const Q_DECL_OVERRIDE;
     IosDsymBuildStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
 };
 
@@ -135,11 +134,11 @@ class IosDsymBuildStepFactory : public IosPresetBuildStepFactory
 {
     Q_OBJECT
 public:
-    bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const QTC_OVERRIDE;
+    bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const Q_DECL_OVERRIDE;
-    QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const QTC_OVERRIDE;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const Q_DECL_OVERRIDE;
-    QString displayNameForId(Core::Id id) const QTC_OVERRIDE;
+    QString displayNameForId(Core::Id id) const Q_DECL_OVERRIDE;
     IosPresetBuildStep *createPresetStep(ProjectExplorer::BuildStepList *parent,
-                                         const Core::Id id) const QTC_OVERRIDE;
+                                         const Core::Id id) const Q_DECL_OVERRIDE;
 };
 
 } // namespace Internal

src/plugins/ios/iosplugin.h

@@ -30,7 +30,6 @@
 #define IOSPLUGIN_H
 
 #include <extensionsystem/iplugin.h>
-#include <utils/qtcoverride.h>
 
 namespace Ios {
 
@@ -42,8 +41,8 @@ class IosPlugin : public ExtensionSystem::IPlugin
 public:
     IosPlugin();
 
-    bool initialize(const QStringList &arguments, QString *errorMessage) QTC_OVERRIDE;
+    bool initialize(const QStringList &arguments, QString *errorMessage) Q_DECL_OVERRIDE;
-    void extensionsInitialized() QTC_OVERRIDE;
+    void extensionsInitialized() Q_DECL_OVERRIDE;
 private slots:
     void kitsRestored();
 };

src/plugins/ios/iosqtversion.h

@@ -30,7 +30,6 @@
 #define IOSQTVERSION_H
 
 #include <qtsupport/baseqtversion.h>
-#include <utils/qtcoverride.h>
 
 #include <QCoreApplication>
 
@@ -46,20 +45,20 @@ public:
     IosQtVersion(const Utils::FileName &path, bool isAutodetected = false,
                  const QString &autodetectionSource = QString());
 
-    IosQtVersion *clone() const QTC_OVERRIDE;
+    IosQtVersion *clone() const Q_DECL_OVERRIDE;
-    QString type() const QTC_OVERRIDE;
+    QString type() const Q_DECL_OVERRIDE;
-    bool isValid() const QTC_OVERRIDE;
+    bool isValid() const Q_DECL_OVERRIDE;
-    QString invalidReason() const QTC_OVERRIDE;
+    QString invalidReason() const Q_DECL_OVERRIDE;
 
-    QList<ProjectExplorer::Abi> detectQtAbis() const QTC_OVERRIDE;
+    QList<ProjectExplorer::Abi> detectQtAbis() const Q_DECL_OVERRIDE;
 
-    void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const QTC_OVERRIDE;
+    void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const Q_DECL_OVERRIDE;
 
-    Core::FeatureSet availableFeatures() const QTC_OVERRIDE;
+    Core::FeatureSet availableFeatures() const Q_DECL_OVERRIDE;
-    QString platformName() const QTC_OVERRIDE;
+    QString platformName() const Q_DECL_OVERRIDE;
-    QString platformDisplayName() const QTC_OVERRIDE;
+    QString platformDisplayName() const Q_DECL_OVERRIDE;
 
-    QString description() const QTC_OVERRIDE;
+    QString description() const Q_DECL_OVERRIDE;
 };
 
 } // namespace Internal

src/plugins/ios/iosqtversionfactory.h

@@ -30,7 +30,6 @@
 #define IOSQTVERSIONFACTORY_H
 
 #include <qtsupport/qtversionfactory.h>
-#include <utils/qtcoverride.h>
 
 namespace Ios {
 namespace Internal {
@@ -40,13 +39,13 @@ class IosQtVersionFactory : public QtSupport::QtVersionFactory
 public:
     explicit IosQtVersionFactory(QObject *parent = 0);
 
-    bool canRestore(const QString &type) QTC_OVERRIDE;
+    bool canRestore(const QString &type) Q_DECL_OVERRIDE;
-    QtSupport::BaseQtVersion *restore(const QString &type, const QVariantMap &data) QTC_OVERRIDE;
+    QtSupport::BaseQtVersion *restore(const QString &type, const QVariantMap &data) Q_DECL_OVERRIDE;
 
-    int priority() const QTC_OVERRIDE;
+    int priority() const Q_DECL_OVERRIDE;
     QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator,
                                      bool isAutoDetected = false,
-                                     const QString &autoDetectionSource = QString()) QTC_OVERRIDE;
+                                     const QString &autoDetectionSource = QString()) Q_DECL_OVERRIDE;
 };
 
 } // namespace Internal

src/plugins/ios/iosrunconfiguration.h

@@ -34,7 +34,6 @@
 
 #include <projectexplorer/runconfiguration.h>
 #include <utils/fileutils.h>
-#include <utils/qtcoverride.h>
 
 namespace QmakeProjectManager {
 class QmakeProFileNode;
@@ -65,8 +64,8 @@ class IosRunConfiguration : public ProjectExplorer::RunConfiguration
 public:
     IosRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, const QString &path);
 
-    QWidget *createConfigurationWidget() QTC_OVERRIDE;
+    QWidget *createConfigurationWidget() Q_DECL_OVERRIDE;
-    Utils::OutputFormatter *createOutputFormatter() const QTC_OVERRIDE;
+    Utils::OutputFormatter *createOutputFormatter() const Q_DECL_OVERRIDE;
     IosDeployStep *deployStep() const;
 
     QStringList commandLineArguments();
@@ -79,8 +78,8 @@ public:
     IosDeviceType::Enum deviceType() const;
     void setDeviceType(IosDeviceType::Enum deviceType);
 
-    bool fromMap(const QVariantMap &map) QTC_OVERRIDE;
+    bool fromMap(const QVariantMap &map) Q_DECL_OVERRIDE;
-    QVariantMap toMap() const QTC_OVERRIDE;
+    QVariantMap toMap() const Q_DECL_OVERRIDE;
 
 protected:
     IosRunConfiguration(ProjectExplorer::Target *parent, IosRunConfiguration *source);

src/plugins/ios/iosruncontrol.h

@@ -30,7 +30,6 @@
 #define IOSRUNCONTROL_H
 
 #include <projectexplorer/runconfiguration.h>
-#include <utils/qtcoverride.h>
 
 namespace Ios {
 namespace Internal {
@@ -47,10 +46,10 @@ public:
     ~IosRunControl();
 
 
-    void start() QTC_OVERRIDE;
+    void start() Q_DECL_OVERRIDE;
-    StopResult stop() QTC_OVERRIDE;
+    StopResult stop() Q_DECL_OVERRIDE;
-    bool isRunning() const QTC_OVERRIDE;
+    bool isRunning() const Q_DECL_OVERRIDE;
-    QString displayName() const QTC_OVERRIDE;
+    QString displayName() const Q_DECL_OVERRIDE;
 
 private slots:
     void handleRemoteProcessFinished(bool cleanEnd);

src/plugins/ios/iosrunfactories.h

@@ -31,7 +31,6 @@
 
 #include <projectexplorer/runconfiguration.h>
 #include <qmakeprojectmanager/qmakerunconfigurationfactory.h>
-#include <utils/qtcoverride.h>
 
 namespace ProjectExplorer {
 class RunControl;
@@ -50,27 +49,27 @@ class IosRunConfigurationFactory : public QmakeProjectManager::QmakeRunConfigura
 public:
     explicit IosRunConfigurationFactory(QObject *parent = 0);
 
-    QString displayNameForId(Core::Id id) const QTC_OVERRIDE;
+    QString displayNameForId(Core::Id id) const Q_DECL_OVERRIDE;
-    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode = UserCreate) const QTC_OVERRIDE;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode = UserCreate) const Q_DECL_OVERRIDE;
 
-    bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const QTC_OVERRIDE;
+    bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const Q_DECL_OVERRIDE;
 
-    bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const QTC_OVERRIDE;
+    bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const Q_DECL_OVERRIDE;
 
     bool canClone(ProjectExplorer::Target *parent,
-                                  ProjectExplorer::RunConfiguration *source) const QTC_OVERRIDE;
+                                  ProjectExplorer::RunConfiguration *source) const Q_DECL_OVERRIDE;
     ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent,
-                                                             ProjectExplorer::RunConfiguration *source) QTC_OVERRIDE;
+                                                             ProjectExplorer::RunConfiguration *source) Q_DECL_OVERRIDE;
 
-    bool canHandle(ProjectExplorer::Target *t) const QTC_OVERRIDE;
+    bool canHandle(ProjectExplorer::Target *t) const Q_DECL_OVERRIDE;
     QList<ProjectExplorer::RunConfiguration *> runConfigurationsForNode(ProjectExplorer::Target *t,
                                                                         const ProjectExplorer::Node *n
-                                                                        ) QTC_OVERRIDE;
+                                                                        ) Q_DECL_OVERRIDE;
 private:
     ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent,
-                                                Core::Id id) QTC_OVERRIDE;
+                                                Core::Id id) Q_DECL_OVERRIDE;
     ProjectExplorer::RunConfiguration *doRestore(ProjectExplorer::Target *parent,
-                                                 const QVariantMap &map) QTC_OVERRIDE;
+                                                 const QVariantMap &map) Q_DECL_OVERRIDE;
 };
 
 class IosRunControlFactory : public ProjectExplorer::IRunControlFactory
@@ -81,10 +80,10 @@ public:
     explicit IosRunControlFactory(QObject *parent = 0);
 
     bool canRun(ProjectExplorer::RunConfiguration *runConfiguration,
-                ProjectExplorer::RunMode mode) const QTC_OVERRIDE;
+                ProjectExplorer::RunMode mode) const Q_DECL_OVERRIDE;
     ProjectExplorer::RunControl *create(ProjectExplorer::RunConfiguration *runConfiguration,
                        ProjectExplorer::RunMode mode,
-                       QString *errorMessage) QTC_OVERRIDE;
+                       QString *errorMessage) Q_DECL_OVERRIDE;
 private:
     mutable QMap<Core::Id, QPointer<ProjectExplorer::RunControl> > m_activeRunControls;
 };

src/plugins/ios/iossettingspage.h

@@ -30,7 +30,6 @@
 #define IOSSETTINGSPAGE_H
 
 #include <coreplugin/dialogs/ioptionspage.h>
-#include <utils/qtcoverride.h>
 
 #include <QPointer>
 
@@ -46,9 +45,9 @@ class IosSettingsPage : public Core::IOptionsPage
 public:
     explicit IosSettingsPage(QObject *parent = 0);
 
-    QWidget *widget() QTC_OVERRIDE;
+    QWidget *widget() Q_DECL_OVERRIDE;
-    void apply() QTC_OVERRIDE;
+    void apply() Q_DECL_OVERRIDE;
-    void finish() QTC_OVERRIDE;
+    void finish() Q_DECL_OVERRIDE;
 
 private:
     QPointer<IosSettingsWidget> m_widget;

src/plugins/ios/iossimulator.h

@@ -31,7 +31,6 @@
 
 #include <projectexplorer/devicesupport/idevice.h>
 #include <utils/fileutils.h>
-#include <utils/qtcoverride.h>
 
 #include <QSharedPointer>
 
@@ -46,20 +45,20 @@ class IosSimulator : public ProjectExplorer::IDevice
 public:
     typedef QSharedPointer<const IosSimulator> ConstPtr;
     typedef QSharedPointer<IosSimulator> Ptr;
-    ProjectExplorer::IDevice::DeviceInfo deviceInformation() const QTC_OVERRIDE;
+    ProjectExplorer::IDevice::DeviceInfo deviceInformation() const Q_DECL_OVERRIDE;
 
-    QString displayType() const QTC_OVERRIDE;
+    QString displayType() const Q_DECL_OVERRIDE;
-    ProjectExplorer::IDeviceWidget *createWidget() QTC_OVERRIDE;
+    ProjectExplorer::IDeviceWidget *createWidget() Q_DECL_OVERRIDE;
-    QList<Core::Id> actionIds() const QTC_OVERRIDE;
+    QList<Core::Id> actionIds() const Q_DECL_OVERRIDE;
-    QString displayNameForActionId(Core::Id actionId) const QTC_OVERRIDE;
+    QString displayNameForActionId(Core::Id actionId) const Q_DECL_OVERRIDE;
-    void executeAction(Core::Id actionId, QWidget *parent = 0) QTC_OVERRIDE;
+    void executeAction(Core::Id actionId, QWidget *parent = 0) Q_DECL_OVERRIDE;
-    ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const QTC_OVERRIDE;
+    ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const Q_DECL_OVERRIDE;
-    void fromMap(const QVariantMap &map) QTC_OVERRIDE;
+    void fromMap(const QVariantMap &map) Q_DECL_OVERRIDE;
-    QVariantMap toMap() const QTC_OVERRIDE;
+    QVariantMap toMap() const Q_DECL_OVERRIDE;
     quint16 nextPort() const;
-    bool canAutoDetectPorts() const QTC_OVERRIDE;
+    bool canAutoDetectPorts() const Q_DECL_OVERRIDE;
 
-    ProjectExplorer::IDevice::Ptr clone() const QTC_OVERRIDE;
+    ProjectExplorer::IDevice::Ptr clone() const Q_DECL_OVERRIDE;
 
 protected:
     friend class IosSimulatorFactory;

src/plugins/ios/iossimulatorfactory.h

@@ -30,7 +30,6 @@
 #define IOSSIMULATORFACTORY_H
 
 #include <projectexplorer/devicesupport/idevicefactory.h>
-#include <utils/qtcoverride.h>
 
 namespace Ios {
 namespace Internal {
@@ -41,13 +40,13 @@ class IosSimulatorFactory : public ProjectExplorer::IDeviceFactory
 public:
     IosSimulatorFactory();
 
-    QString displayNameForId(Core::Id type) const QTC_OVERRIDE;
+    QString displayNameForId(Core::Id type) const Q_DECL_OVERRIDE;
-    QList<Core::Id> availableCreationIds() const QTC_OVERRIDE;
+    QList<Core::Id> availableCreationIds() const Q_DECL_OVERRIDE;
 
-    bool canCreate() const QTC_OVERRIDE;
+    bool canCreate() const Q_DECL_OVERRIDE;
-    ProjectExplorer::IDevice::Ptr create(Core::Id id) const QTC_OVERRIDE;
+    ProjectExplorer::IDevice::Ptr create(Core::Id id) const Q_DECL_OVERRIDE;
-    bool canRestore(const QVariantMap &map) const QTC_OVERRIDE;
+    bool canRestore(const QVariantMap &map) const Q_DECL_OVERRIDE;
-    ProjectExplorer::IDevice::Ptr restore(const QVariantMap &map) const QTC_OVERRIDE;
+    ProjectExplorer::IDevice::Ptr restore(const QVariantMap &map) const Q_DECL_OVERRIDE;
 };
 
 } // namespace Internal

src/plugins/qmakeprojectmanager/profilecompletionassist.h

@@ -32,7 +32,6 @@
 
 #include <texteditor/codeassist/completionassistprovider.h>
 
-#include <utils/qtcoverride.h>
 
 #include <QStringList>
 
@@ -47,8 +46,8 @@ public:
     void init();
     ~ProFileCompletionAssistProvider();
 
-    bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE;
+    bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE;
-    TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
+    TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE;
     QStringList variables() const;
     QStringList functions() const;
 private:

src/plugins/qmldesigner/components/componentcore/abstractactiongroup.h

@@ -45,12 +45,12 @@ public:
 
     virtual bool isVisible(const SelectionContext &m_selectionState) const = 0;
     virtual bool isEnabled(const SelectionContext &m_selectionState) const = 0;
-    ActionInterface::Type type() const QTC_OVERRIDE;
+    ActionInterface::Type type() const Q_DECL_OVERRIDE;
-    QAction *action() const QTC_OVERRIDE;
+    QAction *action() const Q_DECL_OVERRIDE;
     QMenu *menu() const;
     SelectionContext selectionContext() const;
 
-    virtual void currentContextChanged(const SelectionContext &selectionContext) QTC_OVERRIDE;
+    virtual void currentContextChanged(const SelectionContext &selectionContext) Q_DECL_OVERRIDE;
     virtual void updateContext();
 
 private:

src/plugins/qmldesigner/components/debugview/debugview.h

@@ -48,50 +48,50 @@ public:
     ~DebugView();
 
     // AbstractView
-    void modelAttached(Model *model) QTC_OVERRIDE;
+    void modelAttached(Model *model) Q_DECL_OVERRIDE;
-    void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
+    void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE;
 
-    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
+    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE;
 
-    void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
+    void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE;
-    void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
+    void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE;
     void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent,
-                        const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+                        const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
+    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE;
-    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
-    void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
+    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE;
 
     void selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
-                              const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
+                              const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE;
-    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
+    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE;
-    void propertiesRemoved(const QList<AbstractProperty> &propertyList) QTC_OVERRIDE;
+    void propertiesRemoved(const QList<AbstractProperty> &propertyList) Q_DECL_OVERRIDE;
 
-    void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) QTC_OVERRIDE;
+    void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) Q_DECL_OVERRIDE;
 
-    void rewriterBeginTransaction() QTC_OVERRIDE;
+    void rewriterBeginTransaction() Q_DECL_OVERRIDE;
-    void rewriterEndTransaction() QTC_OVERRIDE;
+    void rewriterEndTransaction() Q_DECL_OVERRIDE;
 
-    WidgetInfo widgetInfo() QTC_OVERRIDE;
+    WidgetInfo widgetInfo() Q_DECL_OVERRIDE;
-    bool hasWidget() const QTC_OVERRIDE;
+    bool hasWidget() const Q_DECL_OVERRIDE;
 
-    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
+    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
-    void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
+    void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE;
-    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
+    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE;
-    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data) QTC_OVERRIDE;
+    void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data) Q_DECL_OVERRIDE;
 
-    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
+    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE;
 
-    void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
+    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE;
-    void currentStateChanged(const ModelNode &node) QTC_OVERRIDE;
+    void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE;
-    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
+    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE;
 
 protected:
     void log(const QString &title, const QString &message, bool highlight = false);

src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h

@@ -39,7 +39,7 @@ class QMLDESIGNERCORE_EXPORT AbstractCustomTool : public QmlDesigner::AbstractFo
 public:
     AbstractCustomTool();
 
-    void selectedItemsChanged(const QList<FormEditorItem *> &itemList) QTC_OVERRIDE;
+    void selectedItemsChanged(const QList<FormEditorItem *> &itemList) Q_DECL_OVERRIDE;
 
     virtual QString name() const = 0;
 

src/plugins/qmldesigner/components/formeditor/dragtool.h

@@ -48,36 +48,36 @@ public:
     DragTool(FormEditorView *editorView);
     virtual ~DragTool();
 
-    void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+    void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
-    void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+    void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
-    void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+    void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
-    void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+    void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
 
-    void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+    void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
 
-    void dropEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) QTC_OVERRIDE;
+    void dropEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE;
-    void dragEnterEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) QTC_OVERRIDE;
+    void dragEnterEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE;
-    void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) QTC_OVERRIDE;
+    void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE;
-    void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) QTC_OVERRIDE;
+    void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE;
 
-    void keyPressEvent(QKeyEvent *event) QTC_OVERRIDE;
+    void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
-    void keyReleaseEvent(QKeyEvent *keyEvent) QTC_OVERRIDE;
+    void keyReleaseEvent(QKeyEvent *keyEvent) Q_DECL_OVERRIDE;
 
-    void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+    void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
 
-    void selectedItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+    void selectedItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
-    void instancesParentChanged(const QList<FormEditorItem *> &itemList) QTC_OVERRIDE;
+    void instancesParentChanged(const QList<FormEditorItem *> &itemList) Q_DECL_OVERRIDE;
-    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
+    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
 
     void updateMoveManipulator();
 
     void beginWithPoint(const QPointF &beginPoint);
 
-    void clear() QTC_OVERRIDE;
+    void clear() Q_DECL_OVERRIDE;
 
-    void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+    void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
 
-    void instancesCompleted(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+    void instancesCompleted(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
 
     void clearMoveDelay();
 

src/plugins/qmldesigner/components/formeditor/formeditorview.h

@@ -64,30 +64,30 @@ public:
     ~FormEditorView();
 
     // AbstractView
-    void modelAttached(Model *model) QTC_OVERRIDE;
+    void modelAttached(Model *model) Q_DECL_OVERRIDE;
-    void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
+    void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE;
 
-    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
+    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE;
 
-    void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
+    void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE;
-    void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
+    void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE;
-    void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
+    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE;
-    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
-    void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
+    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE;
 
     void selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
-                              const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
+                              const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE;
-    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
+    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE;
-    void propertiesRemoved(const QList<AbstractProperty> &propertyList) QTC_OVERRIDE;
+    void propertiesRemoved(const QList<AbstractProperty> &propertyList) Q_DECL_OVERRIDE;
 
-    void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data) QTC_OVERRIDE;
+    void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data) Q_DECL_OVERRIDE;
 
     // FormEditorView
-    WidgetInfo widgetInfo() QTC_OVERRIDE;
+    WidgetInfo widgetInfo() Q_DECL_OVERRIDE;
 
     FormEditorWidget *formEditorWidget();
     AbstractFormEditorTool *currentTool() const;
@@ -105,29 +105,29 @@ public:
 
     void registerTool(AbstractCustomTool *tool);
 
-    void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) QTC_OVERRIDE;
+    void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) Q_DECL_OVERRIDE;
 
-    void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
+    void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE;
-    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
+    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE;
-    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
+    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
-    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
+    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE;
 
-    void rewriterBeginTransaction() QTC_OVERRIDE;
+    void rewriterBeginTransaction() Q_DECL_OVERRIDE;
-    void rewriterEndTransaction() QTC_OVERRIDE;
+    void rewriterEndTransaction() Q_DECL_OVERRIDE;
 
     double containerPadding() const;
     double spacing() const;
     void deActivateItemCreator();
 
-    void currentStateChanged(const ModelNode &node) QTC_OVERRIDE;
+    void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE;
 
-    void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
+    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE;
-    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
+    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE;
 
 protected:
     void reset();

src/plugins/qmldesigner/components/formeditor/movetool.h

@@ -47,32 +47,32 @@ public:
     MoveTool(FormEditorView* editorView);
     ~MoveTool();
 
-    void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+    void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
-    void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+    void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
-    void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+    void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
-    void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+    void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
-    void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+    void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
-    void keyPressEvent(QKeyEvent *event) QTC_OVERRIDE;
+    void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
-    void keyReleaseEvent(QKeyEvent *keyEvent) QTC_OVERRIDE;
+    void keyReleaseEvent(QKeyEvent *keyEvent) Q_DECL_OVERRIDE;
 
-    void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) QTC_OVERRIDE;
+    void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) Q_DECL_OVERRIDE;
-    void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) QTC_OVERRIDE;
+    void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) Q_DECL_OVERRIDE;
 
-    void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+    void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
 
-    void selectedItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+    void selectedItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
 
-    void instancesCompleted(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+    void instancesCompleted(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
-    void instancesParentChanged(const QList<FormEditorItem *> &itemList) QTC_OVERRIDE;
+    void instancesParentChanged(const QList<FormEditorItem *> &itemList) Q_DECL_OVERRIDE;
-    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
+    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
 
     void updateMoveManipulator();
 
     void beginWithPoint(const QPointF &beginPoint);
 
-    void clear() QTC_OVERRIDE;
+    void clear() Q_DECL_OVERRIDE;
 
-    void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+    void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
 
 protected:
     static bool haveSameParent(const QList<FormEditorItem*> &itemList);

src/plugins/qmldesigner/components/formeditor/resizetool.h

@@ -45,30 +45,30 @@ public:
     ResizeTool(FormEditorView* editorView);
     ~ResizeTool();
 
-    void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+    void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
-    void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+    void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
-    void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+    void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
-    void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+    void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
 
-    void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+    void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
 
-    void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) QTC_OVERRIDE;
+    void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE;
-    void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) QTC_OVERRIDE;
+    void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE;
 
-    void keyPressEvent(QKeyEvent *event) QTC_OVERRIDE;
+    void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
-    void keyReleaseEvent(QKeyEvent *keyEvent) QTC_OVERRIDE;
+    void keyReleaseEvent(QKeyEvent *keyEvent) Q_DECL_OVERRIDE;
 
-    void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+    void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
 
-    void selectedItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+    void selectedItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
 
-    void clear() QTC_OVERRIDE;
+    void clear() Q_DECL_OVERRIDE;
 
-    void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+    void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
-    void instancesParentChanged(const QList<FormEditorItem *> &itemList) QTC_OVERRIDE;
+    void instancesParentChanged(const QList<FormEditorItem *> &itemList) Q_DECL_OVERRIDE;
 
-    void instancesCompleted(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+    void instancesCompleted(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
-    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
+    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
 
 
 private:

src/plugins/qmldesigner/components/formeditor/selectiontool.h

@@ -51,35 +51,35 @@ public:
     SelectionTool(FormEditorView* editorView);
     ~SelectionTool();
 
-    void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+    void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
-    void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+    void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
-    void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+    void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
-    void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+    void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
 
-    void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+    void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
 
-    void keyPressEvent(QKeyEvent *event) QTC_OVERRIDE;
+    void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
-    void keyReleaseEvent(QKeyEvent *keyEvent) QTC_OVERRIDE;
+    void keyReleaseEvent(QKeyEvent *keyEvent) Q_DECL_OVERRIDE;
 
-    void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) QTC_OVERRIDE;
+    void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) Q_DECL_OVERRIDE;
-    void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) QTC_OVERRIDE;
+    void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) Q_DECL_OVERRIDE;
 
-    void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+    void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
     //    QVariant itemChange(const QList<QGraphicsItem*> &itemList,
 //                        QGraphicsItem::GraphicsItemChange change,
 //                        const QVariant &value );
 
 //    void update();
 
-    void clear() QTC_OVERRIDE;
+    void clear() Q_DECL_OVERRIDE;
 
-    void selectedItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+    void selectedItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
 
-    void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+    void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
 
-    void instancesCompleted(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+    void instancesCompleted(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
-    void instancesParentChanged(const QList<FormEditorItem *> &itemList) QTC_OVERRIDE;
+    void instancesParentChanged(const QList<FormEditorItem *> &itemList) Q_DECL_OVERRIDE;
-    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
+    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
 
     void selectUnderPoint(QGraphicsSceneMouseEvent *event);
 

src/plugins/qmldesigner/components/integration/componentview.h

@@ -56,60 +56,60 @@ public:
 
     ComponentView(QObject *parent = 0);
 
-    void modelAttached(Model *model) QTC_OVERRIDE;
+    void modelAttached(Model *model) Q_DECL_OVERRIDE;
-    void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
+    void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE;
 
     ComponentAction *action();
 
-    void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
+    void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE;
-    void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
+    void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE;
     void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty,
-                     PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+                     PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
     void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent,
                                  const NodeAbstractProperty &oldPropertyParent,
-                                 AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+                                 AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
     void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent,
                         const NodeAbstractProperty &oldPropertyParent,
-                        AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+                        AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
+    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE;
-    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
-    void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+    void propertiesRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
     void variantPropertiesChanged(const QList<VariantProperty>& propertyList,
-                                  PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+                                  PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
     void bindingPropertiesChanged(const QList<BindingProperty>& propertyList,
-                                  PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+                                  PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
     void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,
-                                        PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+                                        PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
+    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE;
-    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
+    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE;
-    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
+    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
-    void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
+    void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE;
-    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
+    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE;
-    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
+    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE;
 
-    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
+    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE;
 
-    void rewriterBeginTransaction() QTC_OVERRIDE;
+    void rewriterBeginTransaction() Q_DECL_OVERRIDE;
-    void rewriterEndTransaction() QTC_OVERRIDE;
+    void rewriterEndTransaction() Q_DECL_OVERRIDE;
 
-    void currentStateChanged(const ModelNode &node) QTC_OVERRIDE;
+    void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE;
 
     void selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
-                                      const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
+                                      const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE;
 
-    void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) QTC_OVERRIDE;
+    void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) Q_DECL_OVERRIDE;
 
-    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
+    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE;
 
-    void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) QTC_OVERRIDE;
+    void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) Q_DECL_OVERRIDE;
 
     void customNotification(const AbstractView *view, const QString &identifier,
-                            const QList<ModelNode> &nodeList, const QList<QVariant> &data) QTC_OVERRIDE;
+                            const QList<ModelNode> &nodeList, const QList<QVariant> &data) Q_DECL_OVERRIDE;
 
-    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
+    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE;
 
     QStandardItemModel *standardItemModel() const;
 

src/plugins/qmldesigner/components/integration/designdocumentview.h

@@ -42,46 +42,46 @@ public:
     DesignDocumentView(QObject *parent = 0);
     ~DesignDocumentView();
 
-    virtual void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
+    virtual void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE;
-    virtual void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
+    virtual void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE;
-    virtual void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    virtual void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
     virtual void nodeAboutToBeReparented(const ModelNode &node,
                                          const NodeAbstractProperty &newPropertyParent,
                                          const NodeAbstractProperty &oldPropertyParent,
-                                         AbstractView::PropertyChangeFlags propertyChange)  QTC_OVERRIDE;
+                                         AbstractView::PropertyChangeFlags propertyChange)  Q_DECL_OVERRIDE;
     virtual void nodeReparented(const ModelNode &node,
                                 const NodeAbstractProperty &newPropertyParent,
                                 const NodeAbstractProperty &oldPropertyParent,
-                                AbstractView::PropertyChangeFlags propertyChange)  QTC_OVERRIDE;
+                                AbstractView::PropertyChangeFlags propertyChange)  Q_DECL_OVERRIDE;
-    virtual void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
+    virtual void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE;
-    virtual void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+    virtual void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
-    virtual void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+    virtual void propertiesRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
-    virtual void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    virtual void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    virtual void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    virtual void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    virtual void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    virtual void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    virtual void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
+    virtual void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE;
 
     virtual void selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
-                                      const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
+                                      const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE;
 
-    virtual void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
+    virtual void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE;
-    virtual void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
+    virtual void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE;
-    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
+    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
-    void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
+    void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE;
-    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
+    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE;
-    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
+    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE;
 
-    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
+    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE;
 
     void rewriterBeginTransaction();
     void rewriterEndTransaction();
 
-    void currentStateChanged(const ModelNode &node) QTC_OVERRIDE;
+    void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE;
 
-    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
+    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE;
 
     ModelNode insertModel(const ModelNode &modelNode)
     { return m_modelMerger.insertModel(modelNode); }

src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h

@@ -48,57 +48,57 @@ public:
     ItemLibraryView(QObject* parent = 0);
     ~ItemLibraryView();
 
-    bool hasWidget() const QTC_OVERRIDE;
+    bool hasWidget() const Q_DECL_OVERRIDE;
-    WidgetInfo widgetInfo() QTC_OVERRIDE;
+    WidgetInfo widgetInfo() Q_DECL_OVERRIDE;
 
     // AbstractView
-    void modelAttached(Model *model) QTC_OVERRIDE;
+    void modelAttached(Model *model) Q_DECL_OVERRIDE;
-    void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
+    void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE;
 
-    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
+    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE;
 
-    void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
+    void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE;
     void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty,
-                     PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+                     PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void propertiesRemoved(const QList<AbstractProperty> &propertyList) QTC_OVERRIDE;
+    void propertiesRemoved(const QList<AbstractProperty> &propertyList) Q_DECL_OVERRIDE;
     void variantPropertiesChanged(const QList<VariantProperty> &propertyList,
-                                  PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+                                  PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
     void bindingPropertiesChanged(const QList<BindingProperty> &propertyList,
-                                  PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+                                  PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
     void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,
-                                                PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+                                                PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
 
-    void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
+    void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE;
-    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
+    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE;
 
     void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent,
                                  const NodeAbstractProperty &oldPropertyParent,
-                                 AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+                                 AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
     void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent,
                         const NodeAbstractProperty &oldPropertyParent,
-                        AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+                        AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
+    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE;
-    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
+    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE;
-    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
 
     void selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
-                                      const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
+                                      const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE;
-    void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) QTC_OVERRIDE;
+    void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) Q_DECL_OVERRIDE;
-    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
+    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE;
-    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
+    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
-    void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
+    void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE;
-    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
+    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE;
-    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
+    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE;
 
-    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
+    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE;
 
-    void rewriterBeginTransaction() QTC_OVERRIDE;
+    void rewriterBeginTransaction() Q_DECL_OVERRIDE;
-    void rewriterEndTransaction() QTC_OVERRIDE;
+    void rewriterEndTransaction() Q_DECL_OVERRIDE;
 
-    void currentStateChanged(const ModelNode &node) QTC_OVERRIDE;
+    void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE;
 
     void setResourcePath(const QString &resourcePath);
 

src/plugins/qmldesigner/components/navigator/navigatorview.h

@@ -57,45 +57,45 @@ public:
     WidgetInfo widgetInfo();
 
     // AbstractView
-    void modelAttached(Model *model) QTC_OVERRIDE;
+    void modelAttached(Model *model) Q_DECL_OVERRIDE;
-    void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
+    void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE;
 
-    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
+    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE;
 
-    void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
+    void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE;
-    void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void propertiesRemoved(const QList<AbstractProperty> &propertyList) QTC_OVERRIDE;
+    void propertiesRemoved(const QList<AbstractProperty> &propertyList) Q_DECL_OVERRIDE;
-    void variantPropertiesChanged(const QList<VariantProperty> &propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void variantPropertiesChanged(const QList<VariantProperty> &propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
 
-    void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
+    void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE;
-    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
+    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE;
 
-    void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
+    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE;
-    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
+    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE;
-    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
 
     void selectedNodesChanged(const QList<ModelNode> &selectedNodeList ,
-                                      const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
+                                      const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE;
-    void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) QTC_OVERRIDE;
+    void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) Q_DECL_OVERRIDE;
-    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
+    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE;
-    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
+    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
-    void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
+    void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE;
-    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
+    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE;
-    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
+    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE;
 
-    void rewriterBeginTransaction() QTC_OVERRIDE;
+    void rewriterBeginTransaction() Q_DECL_OVERRIDE;
-    void rewriterEndTransaction() QTC_OVERRIDE;
+    void rewriterEndTransaction() Q_DECL_OVERRIDE;
 
-    void currentStateChanged(const ModelNode &node) QTC_OVERRIDE;
+    void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE;
 
-    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
+    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE;
 
 private slots:
     void changeSelection(const QItemSelection &selected, const QItemSelection &deselected);

src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h

@@ -62,46 +62,46 @@ public:
     WidgetInfo widgetInfo();
 
     void selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
-                              const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
+                              const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE;
-    void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
+    void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE;
 
-    void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+    void propertiesRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
 
-    void modelAttached(Model *model) QTC_OVERRIDE;
+    void modelAttached(Model *model) Q_DECL_OVERRIDE;
 
-    void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
+    void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE;
 
     ModelState modelState() const;
 
-    void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
 
-    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
+    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE;
 
-    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
+    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE;
-    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
+    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE;
 
     void resetView();
-    void currentStateChanged(const ModelNode &node) QTC_OVERRIDE;
+    void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE;
-    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
+    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
 
-    void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
+    void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE;
-    void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void propertiesAboutToBeRemoved(const QList<AbstractProperty> &propertyList) QTC_OVERRIDE;
+    void propertiesAboutToBeRemoved(const QList<AbstractProperty> &propertyList) Q_DECL_OVERRIDE;
-    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
+    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE;
-    void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
+    void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE;
-    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
+    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE;
-    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
+    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE;
-    void rewriterBeginTransaction() QTC_OVERRIDE;
+    void rewriterBeginTransaction() Q_DECL_OVERRIDE;
-    void rewriterEndTransaction() QTC_OVERRIDE;
+    void rewriterEndTransaction() Q_DECL_OVERRIDE;
-    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
+    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE;
-    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
+    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE;
 
 protected:
     void timerEvent(QTimerEvent *event);

src/plugins/qmldesigner/components/stateseditor/stateseditorview.h

@@ -55,53 +55,53 @@ public:
     QmlModelStateGroup rootStateGroup() const;
 
     // AbstractView
-    void modelAttached(Model *model) QTC_OVERRIDE;
+    void modelAttached(Model *model) Q_DECL_OVERRIDE;
-    void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
+    void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE;
-    void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+    void propertiesRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
     void variantPropertiesChanged(const QList<VariantProperty>& propertyList,
-                                  PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+                                  PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
 
-    void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
+    void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE;
     void nodeRemoved(const ModelNode &removedNode,
                      const NodeAbstractProperty &parentProperty,
-                     PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+                     PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
     void nodeAboutToBeReparented(const ModelNode &node,
                                  const NodeAbstractProperty &newPropertyParent,
                                  const NodeAbstractProperty &oldPropertyParent,
-                                 AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+                                 AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
     void nodeReparented(const ModelNode &node,
                         const NodeAbstractProperty &newPropertyParent,
                         const NodeAbstractProperty &oldPropertyParent,
-                        AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+                        AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
+    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE;
 
 
     // AbstractView
-    void currentStateChanged(const ModelNode &node) QTC_OVERRIDE;
+    void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE;
 
-    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
+    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE;
-    void nodeIdChanged(const ModelNode &node, const QString &newId, const QString &oldId) QTC_OVERRIDE;
+    void nodeIdChanged(const ModelNode &node, const QString &newId, const QString &oldId) Q_DECL_OVERRIDE;
-    void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
+    void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE;
 
-    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
 
-    WidgetInfo widgetInfo() QTC_OVERRIDE;
+    WidgetInfo widgetInfo() Q_DECL_OVERRIDE;
 
-    void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
+    void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE;
-    void propertiesAboutToBeRemoved(const QList<AbstractProperty> &propertyList) QTC_OVERRIDE;
+    void propertiesAboutToBeRemoved(const QList<AbstractProperty> &propertyList) Q_DECL_OVERRIDE;
-    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
+    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE;
-    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
+    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
-    void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
+    void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE;
-    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
+    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE;
-    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
+    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE;
-    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
+    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE;
-    void rewriterBeginTransaction() QTC_OVERRIDE;
+    void rewriterBeginTransaction() Q_DECL_OVERRIDE;
-    void rewriterEndTransaction() QTC_OVERRIDE;
+    void rewriterEndTransaction() Q_DECL_OVERRIDE;
-    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
+    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE;
 
 public slots:
     void synchonizeCurrentStateFromWidget();

src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp

@@ -49,7 +49,7 @@ public:
     { }
 
 public /*slots*/:
-    void actionTriggered(bool) QTC_OVERRIDE
+    void actionTriggered(bool) Q_DECL_OVERRIDE
     {
         DocumentManager::goIntoComponent(m_selectionContext.targetNode());
     }

src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h

@@ -39,10 +39,10 @@ class EnterTabDesignerAction : public AbstractActionGroup
 public:
     EnterTabDesignerAction();
 
-    QByteArray category() const QTC_OVERRIDE;
+    QByteArray category() const Q_DECL_OVERRIDE;
-    QByteArray menuId() const QTC_OVERRIDE;
+    QByteArray menuId() const Q_DECL_OVERRIDE;
-    int priority() const QTC_OVERRIDE;
+    int priority() const Q_DECL_OVERRIDE;
-    void updateContext() QTC_OVERRIDE;
+    void updateContext() Q_DECL_OVERRIDE;
 
 protected:
     bool isVisible(const SelectionContext &selectionContext) const;

src/plugins/qmldesigner/designercore/include/nodeinstanceview.h

@@ -84,44 +84,44 @@ public:
     explicit NodeInstanceView(QObject *parent = 0, NodeInstanceServerInterface::RunModus runModus = NodeInstanceServerInterface::NormalModus);
     ~NodeInstanceView();
 
-    void modelAttached(Model *model) QTC_OVERRIDE;
+    void modelAttached(Model *model) Q_DECL_OVERRIDE;
-    void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
+    void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE;
-    void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
+    void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE;
-    void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
+    void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE;
-    void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
-    void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+    void propertiesRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
-    void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty> &propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty> &propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
     void nodeAboutToBeReparented(const ModelNode &node,
                                  const NodeAbstractProperty &newPropertyParent,
                                  const NodeAbstractProperty &oldPropertyParent,
-                                 AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+                                 AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
     void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent,
                         const NodeAbstractProperty &oldPropertyParent,
-                        AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+                        AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
+    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE;
-    void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) QTC_OVERRIDE;
+    void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) Q_DECL_OVERRIDE;
-    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
+    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE;
-    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
+    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE;
-    void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
+    void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE;
-    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
+    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE;
-    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
+    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
-    void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
+    void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE;
-    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
+    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE;
-    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
+    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE;
-    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
+    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE;
-    void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) QTC_OVERRIDE;
+    void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) Q_DECL_OVERRIDE;
-    void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data) QTC_OVERRIDE;
+    void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data) Q_DECL_OVERRIDE;
-    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
+    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE;
 
 
-    void rewriterBeginTransaction() QTC_OVERRIDE;
+    void rewriterBeginTransaction() Q_DECL_OVERRIDE;
-    void rewriterEndTransaction() QTC_OVERRIDE;
+    void rewriterEndTransaction() Q_DECL_OVERRIDE;
 
     void currentStateChanged(const ModelNode &node);
 

src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h

@@ -33,7 +33,6 @@
 #include <QtGlobal>
 #include <QList>
 
-#include <utils/qtcoverride.h>
 
 // Unnecessary since core isn't a dll any more.
 

src/plugins/qmldesigner/designercore/include/rewriterview.h

@@ -114,51 +114,51 @@ public:
     RewriterView(DifferenceHandling differenceHandling, QObject *parent);
     ~RewriterView();
 
-    void modelAttached(Model *model) QTC_OVERRIDE;
+    void modelAttached(Model *model) Q_DECL_OVERRIDE;
-    void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
+    void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE;
-    void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
+    void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE;
-    void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
+    void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE;
-    void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
-    void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+    void propertiesRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
-    void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
     void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent,
                                  const NodeAbstractProperty &oldPropertyParent,
-                                 AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+                                 AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
     void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent,
                         const NodeAbstractProperty &oldPropertyParent,
-                        AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+                        AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
-    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
+    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE;
-    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
+    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE;
-    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
+    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE;
     void customNotification(const AbstractView *view, const QString &identifier,
                             const QList<ModelNode> &nodeList,
-                            const QList<QVariant> &data) QTC_OVERRIDE;
+                            const QList<QVariant> &data) Q_DECL_OVERRIDE;
-    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
+    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE;
 
-    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
+    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
-    void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
+    void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE;
-    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
+    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE;
-    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
-    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
+    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE;
 
-    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
+    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE;
 
-    void rewriterBeginTransaction() QTC_OVERRIDE;
+    void rewriterBeginTransaction() Q_DECL_OVERRIDE;
-    void rewriterEndTransaction() QTC_OVERRIDE;
+    void rewriterEndTransaction() Q_DECL_OVERRIDE;
 
-    void currentStateChanged(const ModelNode &node) QTC_OVERRIDE;
+    void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE;
 
 
-    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
+    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE;
 
-    void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) QTC_OVERRIDE;
+    void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) Q_DECL_OVERRIDE;
 
-    void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
+    void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE;
 
     TextModifier *textModifier() const;
     void setTextModifier(TextModifier *textModifier);

src/plugins/qmljseditor/qmljscompletionassist.cpp

@@ -42,7 +42,6 @@
 #include <texteditor/completionsettings.h>
 
 #include <utils/qtcassert.h>
-#include <utils/qtcoverride.h>
 
 #include <qmljs/qmljsmodelmanagerinterface.h>
 #include <qmljs/parser/qmljsast_p.h>
@@ -135,7 +134,7 @@ public:
         , order(order)
     {}
 
-    void operator()(const Value *base, const QString &name, const Value *value) QTC_OVERRIDE
+    void operator()(const Value *base, const QString &name, const Value *value) Q_DECL_OVERRIDE
     {
         Q_UNUSED(base)
         QVariant data;
@@ -163,7 +162,7 @@ public:
         , afterOn(afterOn)
     {}
 
-    void operator ()(const Value *base, const QString &name, const Value *) QTC_OVERRIDE
+    void operator ()(const Value *base, const QString &name, const Value *) Q_DECL_OVERRIDE
     {
         const CppComponentValue *qmlBase = value_cast<CppComponentValue>(base);
 
@@ -245,34 +244,34 @@ private:
         (*_propertyProcessor)(_currentObject, name, value);
     }
 
-    bool processProperty(const QString &name, const Value *value, const PropertyInfo &) QTC_OVERRIDE
+    bool processProperty(const QString &name, const Value *value, const PropertyInfo &) Q_DECL_OVERRIDE
     {
         process(name, value);
         return true;
     }
 
-    bool processEnumerator(const QString &name, const Value *value) QTC_OVERRIDE
+    bool processEnumerator(const QString &name, const Value *value) Q_DECL_OVERRIDE
     {
         if (! _globalCompletion)
             process(name, value);
         return true;
     }
 
-    bool processSignal(const QString &name, const Value *value) QTC_OVERRIDE
+    bool processSignal(const QString &name, const Value *value) Q_DECL_OVERRIDE
     {
         if (_globalCompletion)
             process(name, value);
         return true;
     }
 
-    bool processSlot(const QString &name, const Value *value) QTC_OVERRIDE
+    bool processSlot(const QString &name, const Value *value) Q_DECL_OVERRIDE
     {
         if (_enumerateSlots)
             process(name, value);
         return true;
     }
 
-    bool processGeneratedSlot(const QString &name, const Value *value) QTC_OVERRIDE
+    bool processGeneratedSlot(const QString &name, const Value *value) Q_DECL_OVERRIDE
     {
         if (_enumerateGeneratedSlots || (_currentObject && _currentObject->className().endsWith(QLatin1String("Keys")))) {
             // ### FIXME: add support for attached properties.
@@ -403,10 +402,10 @@ public:
         , m_isVariadic(isVariadic)
     {}
 
-    void reset() QTC_OVERRIDE {}
+    void reset() Q_DECL_OVERRIDE {}
-    int size() const QTC_OVERRIDE { return 1; }
+    int size() const Q_DECL_OVERRIDE { return 1; }
-    QString text(int index) const QTC_OVERRIDE;
+    QString text(int index) const Q_DECL_OVERRIDE;
-    int activeArgument(const QString &prefix) const QTC_OVERRIDE;
+    int activeArgument(const QString &prefix) const Q_DECL_OVERRIDE;
 
 private:
     QString m_functionName;

src/plugins/qmljseditor/qmljscompletionassist.h

@@ -39,7 +39,6 @@
 #include <texteditor/snippets/snippetassistcollector.h>
 #include <texteditor/codeassist/assistinterface.h>
 
-#include <utils/qtcoverride.h>
 
 #include <QStringList>
 #include <QScopedPointer>
@@ -56,9 +55,9 @@ class QmlJSCompletionAssistInterface;
 class QmlJSAssistProposalItem : public TextEditor::AssistProposalItem
 {
 public:
-    bool prematurelyApplies(const QChar &c) const QTC_OVERRIDE;
+    bool prematurelyApplies(const QChar &c) const Q_DECL_OVERRIDE;
     void applyContextualContent(TextEditor::BaseTextEditorWidget *editorWidget,
-                                int basePosition) const QTC_OVERRIDE;
+                                int basePosition) const Q_DECL_OVERRIDE;
 };
 
 
@@ -70,9 +69,9 @@ public:
         loadContent(items);
     }
 
-    void filter(const QString &prefix) QTC_OVERRIDE;
+    void filter(const QString &prefix) Q_DECL_OVERRIDE;
-    void sort(const QString &prefix) QTC_OVERRIDE;
+    void sort(const QString &prefix) Q_DECL_OVERRIDE;
-    bool keepPerfectMatch(TextEditor::AssistReason reason) const QTC_OVERRIDE;
+    bool keepPerfectMatch(TextEditor::AssistReason reason) const Q_DECL_OVERRIDE;
 };
 
 
@@ -81,12 +80,12 @@ class QmlJSCompletionAssistProvider : public TextEditor::CompletionAssistProvide
     Q_OBJECT
 
 public:
-    bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE;
+    bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE;
-    TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
+    TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE;
 
-    int activationCharSequenceLength() const QTC_OVERRIDE;
+    int activationCharSequenceLength() const Q_DECL_OVERRIDE;
-    bool isActivationCharSequence(const QString &sequence) const QTC_OVERRIDE;
+    bool isActivationCharSequence(const QString &sequence) const Q_DECL_OVERRIDE;
-    bool isContinuationChar(const QChar &c) const QTC_OVERRIDE;
+    bool isContinuationChar(const QChar &c) const Q_DECL_OVERRIDE;
 };
 
 
@@ -96,7 +95,7 @@ public:
     QmlJSCompletionAssistProcessor();
     ~QmlJSCompletionAssistProcessor();
 
-    TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) QTC_OVERRIDE;
+    TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) Q_DECL_OVERRIDE;
 
 private:
     TextEditor::IAssistProposal *createContentProposal() const;

src/plugins/qmljseditor/qmljsquickfixassist.h

@@ -38,7 +38,6 @@
 #include <texteditor/codeassist/quickfixassistprovider.h>
 #include <texteditor/codeassist/quickfixassistprocessor.h>
 
-#include <utils/qtcoverride.h>
 
 namespace QmlJSEditor {
 namespace Internal {
@@ -64,7 +63,7 @@ public:
     QmlJSQuickFixProcessor(const TextEditor::IAssistProvider *provider);
     ~QmlJSQuickFixProcessor();
 
-    const TextEditor::IAssistProvider *provider() const QTC_OVERRIDE;
+    const TextEditor::IAssistProvider *provider() const Q_DECL_OVERRIDE;
 
 private:
     const TextEditor::IAssistProvider *m_provider;
@@ -77,11 +76,11 @@ public:
     QmlJSQuickFixAssistProvider();
     ~QmlJSQuickFixAssistProvider();
 
-    bool isAsynchronous() const QTC_OVERRIDE;
+    bool isAsynchronous() const Q_DECL_OVERRIDE;
-    bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE;
+    bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE;
-    TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
+    TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE;
 
-    QList<TextEditor::QuickFixFactory *> quickFixFactories() const QTC_OVERRIDE;
+    QList<TextEditor::QuickFixFactory *> quickFixFactories() const Q_DECL_OVERRIDE;
 };
 
 } // Internal

src/plugins/qmljstools/qmljsmodelmanager.h

@@ -37,7 +37,6 @@
 #include <qmljs/qmljsconstants.h>
 
 #include <cplusplus/CppDocument.h>
-#include <utils/qtcoverride.h>
 
 #include <QFuture>
 #include <QFutureSynchronizer>
@@ -61,11 +60,11 @@ public:
 
     void delayedInitialization();
 protected:
-    QHash<QString, QmlJS::Dialect> languageForSuffix() const QTC_OVERRIDE;
+    QHash<QString, QmlJS::Dialect> languageForSuffix() const Q_DECL_OVERRIDE;
-    void writeMessageInternal(const QString &msg) const QTC_OVERRIDE;
+    void writeMessageInternal(const QString &msg) const Q_DECL_OVERRIDE;
-    WorkingCopy workingCopyInternal() const QTC_OVERRIDE;
+    WorkingCopy workingCopyInternal() const Q_DECL_OVERRIDE;
-    void addTaskInternal(QFuture<void> result, const QString &msg, const char *taskId) const QTC_OVERRIDE;
+    void addTaskInternal(QFuture<void> result, const QString &msg, const char *taskId) const Q_DECL_OVERRIDE;
-    ProjectInfo defaultProjectInfoForProject(ProjectExplorer::Project *project) const QTC_OVERRIDE;
+    ProjectInfo defaultProjectInfoForProject(ProjectExplorer::Project *project) const Q_DECL_OVERRIDE;
 private slots:
     void updateDefaultProjectInfo();
 private:

src/plugins/texteditor/circularclipboardassist.cpp

@@ -39,7 +39,6 @@
 
 #include <coreplugin/coreconstants.h>
 
-#include <utils/qtcoverride.h>
 
 #include <QApplication>
 #include <QClipboard>
@@ -63,7 +62,7 @@ public:
         setText(text);
     }
 
-    void apply(BaseTextEditorWidget *editorWidget, int /*basePosition*/) const QTC_OVERRIDE
+    void apply(BaseTextEditorWidget *editorWidget, int /*basePosition*/) const Q_DECL_OVERRIDE
     {
 
         //Move to last in circular clipboard
@@ -87,7 +86,7 @@ private:
 class ClipboardAssistProcessor: public IAssistProcessor
 {
 public:
-    IAssistProposal *perform(const AssistInterface *interface) QTC_OVERRIDE
+    IAssistProposal *perform(const AssistInterface *interface) Q_DECL_OVERRIDE
     {
         if (!interface)
             return 0;

src/plugins/texteditor/circularclipboardassist.h

@@ -32,7 +32,6 @@
 
 #include "codeassist/iassistprovider.h"
 
-#include <utils/qtcoverride.h>
 
 namespace TextEditor {
 namespace Internal {
@@ -41,8 +40,8 @@ class ClipboardAssistProvider: public IAssistProvider
 {
 public:
     bool isAsynchronous() const;
-    bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE;
+    bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE;
-    IAssistProcessor *createProcessor() const QTC_OVERRIDE;
+    IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE;
 };
 
 } // namespace Internal

src/plugins/texteditor/codeassist/assistinterface.h

@@ -34,7 +34,6 @@
 
 #include <texteditor/texteditor_global.h>
 
-#include <utils/qtcoverride.h>
 
 #include <QString>
 

src/plugins/texteditor/codeassist/assistproposalitem.h

@@ -32,7 +32,6 @@
 
 #include <texteditor/texteditor_global.h>
 
-#include <utils/qtcoverride.h>
 
 #include <QIcon>
 #include <QString>

src/plugins/texteditor/codeassist/completionassistprovider.h

@@ -32,7 +32,6 @@
 
 #include "iassistprovider.h"
 
-#include <utils/qtcoverride.h>
 
 namespace TextEditor {
 
@@ -44,7 +43,7 @@ public:
     CompletionAssistProvider();
     ~CompletionAssistProvider();
 
-    bool isAsynchronous() const QTC_OVERRIDE;
+    bool isAsynchronous() const Q_DECL_OVERRIDE;
     virtual int activationCharSequenceLength() const;
     virtual bool isActivationCharSequence(const QString &sequence) const;
     virtual bool isContinuationChar(const QChar &c) const;

src/plugins/texteditor/codeassist/functionhintproposal.h

@@ -32,7 +32,6 @@
 
 #include "iassistproposal.h"
 
-#include <utils/qtcoverride.h>
 
 namespace TextEditor {
 
@@ -44,12 +43,12 @@ public:
     FunctionHintProposal(int cursorPos, IFunctionHintProposalModel *model);
     ~FunctionHintProposal();
 
-    bool isFragile() const QTC_OVERRIDE;
+    bool isFragile() const Q_DECL_OVERRIDE;
-    int basePosition() const QTC_OVERRIDE;
+    int basePosition() const Q_DECL_OVERRIDE;
-    bool isCorrective() const QTC_OVERRIDE;
+    bool isCorrective() const Q_DECL_OVERRIDE;
-    void makeCorrection(BaseTextEditorWidget *editorWidget) QTC_OVERRIDE;
+    void makeCorrection(BaseTextEditorWidget *editorWidget) Q_DECL_OVERRIDE;
-    IAssistProposalModel *model() const QTC_OVERRIDE;
+    IAssistProposalModel *model() const Q_DECL_OVERRIDE;
-    IAssistProposalWidget *createWidget() const QTC_OVERRIDE;
+    IAssistProposalWidget *createWidget() const Q_DECL_OVERRIDE;
 
 private:
     int m_basePosition;

src/plugins/texteditor/codeassist/functionhintproposalwidget.h

@@ -32,7 +32,6 @@
 
 #include "iassistproposalwidget.h"
 
-#include <utils/qtcoverride.h>
 
 namespace TextEditor {
 
@@ -46,20 +45,20 @@ public:
     FunctionHintProposalWidget();
     ~FunctionHintProposalWidget();
 
-    void setAssistant(CodeAssistant *assistant) QTC_OVERRIDE;
+    void setAssistant(CodeAssistant *assistant) Q_DECL_OVERRIDE;
-    void setReason(AssistReason reason) QTC_OVERRIDE;
+    void setReason(AssistReason reason) Q_DECL_OVERRIDE;
-    void setKind(AssistKind kind) QTC_OVERRIDE;
+    void setKind(AssistKind kind) Q_DECL_OVERRIDE;
-    void setUnderlyingWidget(const QWidget *underlyingWidget) QTC_OVERRIDE;
+    void setUnderlyingWidget(const QWidget *underlyingWidget) Q_DECL_OVERRIDE;
-    void setModel(IAssistProposalModel *model) QTC_OVERRIDE;
+    void setModel(IAssistProposalModel *model) Q_DECL_OVERRIDE;
-    void setDisplayRect(const QRect &rect) QTC_OVERRIDE;
+    void setDisplayRect(const QRect &rect) Q_DECL_OVERRIDE;
-    void setIsSynchronized(bool isSync) QTC_OVERRIDE;
+    void setIsSynchronized(bool isSync) Q_DECL_OVERRIDE;
 
-    void showProposal(const QString &prefix) QTC_OVERRIDE;
+    void showProposal(const QString &prefix) Q_DECL_OVERRIDE;
-    void updateProposal(const QString &prefix) QTC_OVERRIDE;
+    void updateProposal(const QString &prefix) Q_DECL_OVERRIDE;
-    void closeProposal() QTC_OVERRIDE;
+    void closeProposal() Q_DECL_OVERRIDE;
 
 protected:
-    bool eventFilter(QObject *o, QEvent *e) QTC_OVERRIDE;
+    bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE;
 
 private slots:
     void nextPage();

src/plugins/texteditor/codeassist/genericproposal.h

@@ -32,7 +32,6 @@
 
 #include "iassistproposal.h"
 
-#include <utils/qtcoverride.h>
 
 namespace TextEditor {
 
@@ -46,12 +45,12 @@ public:
     GenericProposal(int cursorPos, const QList<AssistProposalItem *> &items);
     ~GenericProposal();
 
-    bool isFragile() const QTC_OVERRIDE;
+    bool isFragile() const Q_DECL_OVERRIDE;
-    int basePosition() const QTC_OVERRIDE;
+    int basePosition() const Q_DECL_OVERRIDE;
-    bool isCorrective() const QTC_OVERRIDE;
+    bool isCorrective() const Q_DECL_OVERRIDE;
-    void makeCorrection(BaseTextEditorWidget *editorWidget) QTC_OVERRIDE;
+    void makeCorrection(BaseTextEditorWidget *editorWidget) Q_DECL_OVERRIDE;
-    IAssistProposalModel *model() const QTC_OVERRIDE;
+    IAssistProposalModel *model() const Q_DECL_OVERRIDE;
-    IAssistProposalWidget *createWidget() const QTC_OVERRIDE;
+    IAssistProposalWidget *createWidget() const Q_DECL_OVERRIDE;
 
 protected:
     void moveBasePosition(int length);

src/plugins/texteditor/codeassist/genericproposalmodel.h

@@ -35,7 +35,6 @@
 
 #include <texteditor/texteditor_global.h>
 
-#include <utils/qtcoverride.h>
 
 #include <QHash>
 #include <QIcon>
@@ -52,9 +51,9 @@ public:
     GenericProposalModel();
     ~GenericProposalModel();
 
-    void reset() QTC_OVERRIDE;
+    void reset() Q_DECL_OVERRIDE;
-    int size() const QTC_OVERRIDE;
+    int size() const Q_DECL_OVERRIDE;
-    QString text(int index) const QTC_OVERRIDE;
+    QString text(int index) const Q_DECL_OVERRIDE;
 
     virtual QIcon icon(int index) const;
     virtual QString detail(int index) const;

src/plugins/texteditor/codeassist/genericproposalwidget.h

@@ -34,7 +34,6 @@
 
 #include <texteditor/texteditor_global.h>
 
-#include <utils/qtcoverride.h>
 
 namespace TextEditor {
 
@@ -50,17 +49,17 @@ public:
     GenericProposalWidget();
     ~GenericProposalWidget();
 
-    void setAssistant(CodeAssistant *assistant) QTC_OVERRIDE;
+    void setAssistant(CodeAssistant *assistant) Q_DECL_OVERRIDE;
-    void setReason(AssistReason reason) QTC_OVERRIDE;
+    void setReason(AssistReason reason) Q_DECL_OVERRIDE;
-    void setKind(AssistKind kind) QTC_OVERRIDE;
+    void setKind(AssistKind kind) Q_DECL_OVERRIDE;
-    void setUnderlyingWidget(const QWidget *underlyingWidget) QTC_OVERRIDE;
+    void setUnderlyingWidget(const QWidget *underlyingWidget) Q_DECL_OVERRIDE;
-    void setModel(IAssistProposalModel *model) QTC_OVERRIDE;
+    void setModel(IAssistProposalModel *model) Q_DECL_OVERRIDE;
-    void setDisplayRect(const QRect &rect) QTC_OVERRIDE;
+    void setDisplayRect(const QRect &rect) Q_DECL_OVERRIDE;
-    void setIsSynchronized(bool isSync) QTC_OVERRIDE;
+    void setIsSynchronized(bool isSync) Q_DECL_OVERRIDE;
 
-    void showProposal(const QString &prefix) QTC_OVERRIDE;
+    void showProposal(const QString &prefix) Q_DECL_OVERRIDE;
-    void updateProposal(const QString &prefix) QTC_OVERRIDE;
+    void updateProposal(const QString &prefix) Q_DECL_OVERRIDE;
-    void closeProposal() QTC_OVERRIDE;
+    void closeProposal() Q_DECL_OVERRIDE;
 
 private:
     bool updateAndCheck(const QString &prefix);

src/plugins/texteditor/codeassist/keywordscompletionassist.h

@@ -34,7 +34,6 @@
 #include "assistproposalitem.h"
 #include "ifunctionhintproposalmodel.h"
 
-#include <utils/qtcoverride.h>
 
 namespace TextEditor {
 
@@ -62,8 +61,8 @@ public:
     KeywordsAssistProposalItem(bool isFunction);
     ~KeywordsAssistProposalItem();
 
-    bool prematurelyApplies(const QChar &c) const QTC_OVERRIDE;
+    bool prematurelyApplies(const QChar &c) const Q_DECL_OVERRIDE;
-    void applyContextualContent(BaseTextEditorWidget *editorWidget, int basePosition) const QTC_OVERRIDE;
+    void applyContextualContent(BaseTextEditorWidget *editorWidget, int basePosition) const Q_DECL_OVERRIDE;
 private:
     bool m_isFunction;
 };
@@ -74,10 +73,10 @@ public:
     KeywordsFunctionHintModel(const QStringList &functionSymbols);
     ~KeywordsFunctionHintModel();
 
-    void reset() QTC_OVERRIDE;
+    void reset() Q_DECL_OVERRIDE;
-    int size() const QTC_OVERRIDE;
+    int size() const Q_DECL_OVERRIDE;
-    QString text(int index) const QTC_OVERRIDE;
+    QString text(int index) const Q_DECL_OVERRIDE;
-    int activeArgument(const QString &prefix) const QTC_OVERRIDE;
+    int activeArgument(const QString &prefix) const Q_DECL_OVERRIDE;
 
 private:
     QStringList m_functionSymbols;
@@ -89,7 +88,7 @@ public:
     KeywordsCompletionAssistProcessor(Keywords keywords);
     ~KeywordsCompletionAssistProcessor();
 
-    IAssistProposal *perform(const AssistInterface *interface) QTC_OVERRIDE;
+    IAssistProposal *perform(const AssistInterface *interface) Q_DECL_OVERRIDE;
     QChar startOfCommentChar() const;
 
 private:

src/plugins/texteditor/codeassist/quickfixassistprocessor.h

@@ -32,7 +32,6 @@
 
 #include "iassistprocessor.h"
 
-#include <utils/qtcoverride.h>
 
 namespace TextEditor {
 
@@ -44,7 +43,7 @@ public:
 
     virtual const IAssistProvider *provider() const = 0;
 
-    IAssistProposal *perform(const AssistInterface *interface) QTC_OVERRIDE;
+    IAssistProposal *perform(const AssistInterface *interface) Q_DECL_OVERRIDE;
 };
 
 } // TextEditor

src/tools/iostool/iosdevicemanager.cpp

@@ -266,8 +266,8 @@ public:
     bool startService(const QString &service, ServiceSocket &fd);
     void stopService(ServiceSocket fd);
     void startDeviceLookup(int timeout);
-    bool connectToPort(quint16 port, ServiceSocket *fd) QTC_OVERRIDE;
+    bool connectToPort(quint16 port, ServiceSocket *fd) Q_DECL_OVERRIDE;
-    int qmljsDebugPort() const QTC_OVERRIDE;
+    int qmljsDebugPort() const Q_DECL_OVERRIDE;
     void addError(const QString &msg);
     bool writeAll(ServiceSocket fd, const char *cmd, qptrdiff len = -1);
     bool sendGdbCommand(ServiceSocket fd, const char *cmd, qptrdiff len = -1);
@@ -339,7 +339,7 @@ public:
     void deviceCallbackReturned();
     bool installApp();
     bool runApp();
-    int qmljsDebugPort() const QTC_OVERRIDE;
+    int qmljsDebugPort() const Q_DECL_OVERRIDE;
     am_res_t appTransferCallback(CFDictionaryRef dict);
     am_res_t appInstallCallback(CFDictionaryRef dict);
     void reportProgress2(int progress, const QString &status);

src/tools/iostool/iosdevicemanager.h

@@ -43,9 +43,9 @@
 #include <qglobal.h>
 
 #ifdef Q_DECL_OVERRIDE
-#define QTC_OVERRIDE Q_DECL_OVERRIDE
+#define Q_DECL_OVERRIDE Q_DECL_OVERRIDE
 #else
-#define QTC_OVERRIDE
+#define Q_DECL_OVERRIDE
 #endif
 
 namespace Ios {

src/tools/iostool/main.cpp

@@ -125,7 +125,7 @@ class SingleRelayServer: public RelayServer
 public:
     SingleRelayServer(IosTool *parent, int serverFileDescriptor);
 protected:
-    void newRelayConnection() QTC_OVERRIDE;
+    void newRelayConnection() Q_DECL_OVERRIDE;
 private:
     int m_serverFileDescriptor;
 };
@@ -136,7 +136,7 @@ public:
     GenericRelayServer(IosTool *parent, int remotePort,
                        Ios::DeviceSession *deviceSession);
 protected:
-    void newRelayConnection() QTC_OVERRIDE;
+    void newRelayConnection() Q_DECL_OVERRIDE;
 private:
     int m_remotePort;
     Ios::DeviceSession *m_deviceSession;