diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
index a199c22c204..58f6aeab6ab 100644
--- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
@@ -58,27 +58,27 @@ public:
     DesignerActionManagerView() : QmlModelView(0), m_isInRewriterTransaction(false), m_setupContextDirty(false)
     {}
 
-    void modelAttached(Model *model)
+    void modelAttached(Model *model) QTC_OVERRIDE
     {
         QmlModelView::modelAttached(model);
         setupContext();
     }
 
-    void modelAboutToBeDetached(Model *model)
+    void modelAboutToBeDetached(Model *model) QTC_OVERRIDE
     {
         QmlModelView::modelAboutToBeDetached(model);
         setupContext();
     }
 
-    virtual void nodeCreated(const ModelNode &)
+    virtual void nodeCreated(const ModelNode &) QTC_OVERRIDE
     {
         setupContext();
     }
 
-    virtual void nodeAboutToBeRemoved(const ModelNode &)
+    virtual void nodeAboutToBeRemoved(const ModelNode &) QTC_OVERRIDE
     {}
 
-    virtual void nodeRemoved(const ModelNode &, const NodeAbstractProperty &, PropertyChangeFlags)
+    virtual void nodeRemoved(const ModelNode &, const NodeAbstractProperty &, PropertyChangeFlags) QTC_OVERRIDE
     {
         setupContext();
     }
@@ -86,70 +86,70 @@ public:
     virtual void nodeAboutToBeReparented(const ModelNode &,
                                          const NodeAbstractProperty &,
                                          const NodeAbstractProperty &,
-                                         AbstractView::PropertyChangeFlags )
+                                         AbstractView::PropertyChangeFlags ) QTC_OVERRIDE
     {
         setupContext();
     }
 
     virtual void nodeReparented(const ModelNode &, const NodeAbstractProperty &,
                                 const NodeAbstractProperty &,
-                                AbstractView::PropertyChangeFlags)
+                                AbstractView::PropertyChangeFlags) QTC_OVERRIDE
     {
         setupContext();
     }
 
-    virtual void nodeIdChanged(const ModelNode&, const QString&, const QString&)
+    virtual void nodeIdChanged(const ModelNode&, const QString&, const QString&) QTC_OVERRIDE
     {}
 
-    virtual void propertiesAboutToBeRemoved(const QList<AbstractProperty>&)
+    virtual void propertiesAboutToBeRemoved(const QList<AbstractProperty>&) QTC_OVERRIDE
     {}
 
-    virtual void propertiesRemoved(const QList<AbstractProperty>&)
+    virtual void propertiesRemoved(const QList<AbstractProperty>&) QTC_OVERRIDE
     {
         setupContext();
     }
 
-    virtual void variantPropertiesChanged(const QList<VariantProperty>&, PropertyChangeFlags)
+    virtual void variantPropertiesChanged(const QList<VariantProperty>&, PropertyChangeFlags) QTC_OVERRIDE
     {}
 
-    virtual void bindingPropertiesChanged(const QList<BindingProperty>&, PropertyChangeFlags)
+    virtual void bindingPropertiesChanged(const QList<BindingProperty>&, PropertyChangeFlags) QTC_OVERRIDE
     {}
 
-    virtual void rootNodeTypeChanged(const QString &, int , int )
+    virtual void rootNodeTypeChanged(const QString &, int , int ) QTC_OVERRIDE
     {
         setupContext();
     }
 
-    virtual void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &)
+    virtual void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &) QTC_OVERRIDE
     {}
 
-    virtual void instancesCompleted(const QVector<ModelNode> &)
+    virtual void instancesCompleted(const QVector<ModelNode> &) QTC_OVERRIDE
     {}
 
-    virtual void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &)
+    virtual void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &) QTC_OVERRIDE
     {}
 
-    virtual void instancesRenderImageChanged(const QVector<ModelNode> &)
+    virtual void instancesRenderImageChanged(const QVector<ModelNode> &) QTC_OVERRIDE
     {}
 
-    virtual void instancesPreviewImageChanged(const QVector<ModelNode> &)
+    virtual void instancesPreviewImageChanged(const QVector<ModelNode> &) QTC_OVERRIDE
     {}
 
-    virtual void instancesChildrenChanged(const QVector<ModelNode> &)
+    virtual void instancesChildrenChanged(const QVector<ModelNode> &) QTC_OVERRIDE
     {}
 
-    virtual void instancesToken(const QString &, int , const QVector<ModelNode> &)
+    virtual void instancesToken(const QString &, int , const QVector<ModelNode> &) QTC_OVERRIDE
     {}
 
-    virtual void nodeSourceChanged(const ModelNode &, const QString &)
+    virtual void nodeSourceChanged(const ModelNode &, const QString &) QTC_OVERRIDE
     {}
 
-    virtual void rewriterBeginTransaction()
+    virtual void rewriterBeginTransaction() QTC_OVERRIDE
     {
         m_isInRewriterTransaction = true;
     }
 
-    virtual void rewriterEndTransaction()
+    virtual void rewriterEndTransaction() QTC_OVERRIDE
     {
         m_isInRewriterTransaction = false;
 
@@ -157,28 +157,28 @@ public:
             setupContext();
     }
 
-    virtual void actualStateChanged(const ModelNode &)
+    virtual void actualStateChanged(const ModelNode &) QTC_OVERRIDE
     {
         setupContext();
     }
 
     virtual void selectedNodesChanged(const QList<ModelNode> &,
-                                      const QList<ModelNode> &)
+                                      const QList<ModelNode> &) QTC_OVERRIDE
     {
         setupContext();
     }
 
-    virtual void nodeOrderChanged(const NodeListProperty &, const ModelNode &, int )
+    virtual void nodeOrderChanged(const NodeListProperty &, const ModelNode &, int ) QTC_OVERRIDE
     {
         setupContext();
     }
 
-    virtual void importsChanged(const QList<Import> &, const QList<Import> &)
+    virtual void importsChanged(const QList<Import> &, const QList<Import> &) QTC_OVERRIDE
     {
         setupContext();
     }
 
-    virtual void scriptFunctionsChanged(const ModelNode &, const QStringList &)
+    virtual void scriptFunctionsChanged(const ModelNode &, const QStringList &) QTC_OVERRIDE
     {}
 
     void setDesignerActionList(const QList<AbstractDesignerAction* > &designerActionList)
@@ -186,7 +186,7 @@ public:
         m_designerActionList = designerActionList;
     }
 
-    QWidget *widget()
+    QWidget *widget() QTC_OVERRIDE
     {
         return 0;
     }
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.h b/src/plugins/qmldesigner/components/formeditor/formeditorview.h
index 64a50f6f801..374434e5f42 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorview.h
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.h
@@ -65,28 +65,28 @@ public:
     ~FormEditorView();
 
     // AbstractView
-    void modelAttached(Model *model);
-    void modelAboutToBeDetached(Model *model);
+    void modelAttached(Model *model) QTC_OVERRIDE;
+    void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
 
-    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports);
+    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
 
-    void nodeCreated(const ModelNode &createdNode);
-    void nodeAboutToBeRemoved(const ModelNode &removedNode);
-    void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange);
-    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId);
-    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList);
-    void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange);
-    void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange);
-    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion);
+    void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
+    void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
+    void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
+    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+    void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
 
     void selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
-                              const QList<ModelNode> &lastSelectedNodeList);
-    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList);
-    void propertiesRemoved(const QList<AbstractProperty> &propertyList);
+                              const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
+    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
+    void propertiesRemoved(const QList<AbstractProperty> &propertyList) QTC_OVERRIDE;
 
     // FormEditorView
-    QWidget *widget();
-    WidgetInfo widgetInfo();
+    QWidget *widget() QTC_OVERRIDE;
+    WidgetInfo widgetInfo() QTC_OVERRIDE;
 
     FormEditorWidget *formEditorWidget();
     AbstractFormEditorTool *currentTool() const;
@@ -100,27 +100,28 @@ public:
     void changeToResizeTool();
     void changeToTransformTools();
 
+
     void registerTool(AbstractFormEditorTool *tool);
 
     void nodeSlidedToIndex(const NodeListProperty &listProperty, int newIndex, int oldIndex);
-    void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data);
+    void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) QTC_OVERRIDE;
 
-    void instancesCompleted(const QVector<ModelNode> &completedNodeList);
-    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash);
-    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList);
-    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList);
-    void instancesChildrenChanged(const QVector<ModelNode> &nodeList);
-    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList);
-    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector);
+    void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
+    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
+    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
+    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
 
-    void rewriterBeginTransaction();
-    void rewriterEndTransaction();
+    void rewriterBeginTransaction() QTC_OVERRIDE;
+    void rewriterEndTransaction() QTC_OVERRIDE;
 
     double margins() const;
     double spacing() const;
     void deActivateItemCreator();
 
-    void actualStateChanged(const ModelNode &node);
+    void actualStateChanged(const ModelNode &node) QTC_OVERRIDE;
 
 protected:
     void reset();
diff --git a/src/plugins/qmldesigner/components/integration/componentview.h b/src/plugins/qmldesigner/components/integration/componentview.h
index 5b2c3e52577..db29174b690 100644
--- a/src/plugins/qmldesigner/components/integration/componentview.h
+++ b/src/plugins/qmldesigner/components/integration/componentview.h
@@ -56,50 +56,58 @@ public:
 
     ComponentView(QObject *parent = 0);
 
-    void modelAttached(Model *model);
-    void modelAboutToBeDetached(Model *model);
+    void modelAttached(Model *model) QTC_OVERRIDE;
+    void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
 
     ComponentAction *action();
 
-    void nodeCreated(const ModelNode &createdNode);
-    void nodeAboutToBeRemoved(const ModelNode &removedNode);
-    void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange);
-    void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange);
-    void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange);
-    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId);
-    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList);
-    void propertiesRemoved(const QList<AbstractProperty>& propertyList);
-    void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange);
-    void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange);
-    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion);
-    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList);
-    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList);
-    void instancesCompleted(const QVector<ModelNode> &completedNodeList);
-    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &/*informationChangeHash*/);
-    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList);
-    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList);
-    void instancesChildrenChanged(const QVector<ModelNode> &nodeList);
-    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector);
+    void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
+    void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
+    void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty,
+                     PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void nodeAboutToBeReparented(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) QTC_OVERRIDE;
+    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
+    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+    void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+    void variantPropertiesChanged(const QList<VariantProperty>& propertyList,
+                                  PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void bindingPropertiesChanged(const QList<BindingProperty>& propertyList,
+                                  PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
+    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
+    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
+    void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
+    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
+    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
 
-    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource);
+    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
 
-    void rewriterBeginTransaction();
-    void rewriterEndTransaction();
+    void rewriterBeginTransaction() QTC_OVERRIDE;
+    void rewriterEndTransaction() QTC_OVERRIDE;
 
-    void actualStateChanged(const ModelNode &node);
+    void actualStateChanged(const ModelNode &node) QTC_OVERRIDE;
 
     void selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
-                                      const QList<ModelNode> &lastSelectedNodeList);
+                                      const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
 
-    void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl);
+    void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) QTC_OVERRIDE;
 
-    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex);
+    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
 
-    void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data);
+    void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) QTC_OVERRIDE;
 
-    void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data);
+    void customNotification(const AbstractView *view, const QString &identifier,
+                            const QList<ModelNode> &nodeList, const QList<QVariant> &data) QTC_OVERRIDE;
 
-    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports);
+    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
 
     QStandardItemModel *standardItemModel() const;
 
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h
index 013bdfdf2dc..c50b78aaace 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h
@@ -48,49 +48,56 @@ public:
     ItemLibraryView(QObject* parent = 0);
     ~ItemLibraryView();
 
-    QWidget *widget();
-    bool hasWidget() const;
-    WidgetInfo widgetInfo();
+    QWidget *widget() QTC_OVERRIDE;
+    bool hasWidget() const QTC_OVERRIDE;
+    WidgetInfo widgetInfo() QTC_OVERRIDE;
 
     // AbstractView
-    void modelAttached(Model *model);
-    void modelAboutToBeDetached(Model *model);
+    void modelAttached(Model *model) QTC_OVERRIDE;
+    void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
 
-    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports);
+    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
 
-    void nodeCreated(const ModelNode &createdNode);
-    void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange);
-    void propertiesRemoved(const QList<AbstractProperty> &propertyList);
-    void variantPropertiesChanged(const QList<VariantProperty> &propertyList, PropertyChangeFlags propertyChange);
-    void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags propertyChange);
+    void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
+    void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty,
+                     PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void propertiesRemoved(const QList<AbstractProperty> &propertyList) QTC_OVERRIDE;
+    void variantPropertiesChanged(const QList<VariantProperty> &propertyList,
+                                  PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void bindingPropertiesChanged(const QList<BindingProperty> &propertyList,
+                                  PropertyChangeFlags propertyChange) QTC_OVERRIDE;
 
-    void nodeAboutToBeRemoved(const ModelNode &removedNode);
-    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex);
+    void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
+    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
 
-    void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange);
-    void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange);
-    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion);
-    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId);
-    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList);
+    void nodeAboutToBeReparented(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) QTC_OVERRIDE;
+    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
+    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
+    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
 
     void selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
-                                      const QList<ModelNode> &lastSelectedNodeList);
-    void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data);
-    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList);
-    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList);
-    void instancesCompleted(const QVector<ModelNode> &completedNodeList);
-    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash);
-    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList);
-    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList);
-    void instancesChildrenChanged(const QVector<ModelNode> &nodeList);
-    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector);
+                                      const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
+    void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) QTC_OVERRIDE;
+    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
+    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
+    void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
+    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
+    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
 
-    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource);
+    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
 
-    void rewriterBeginTransaction();
-    void rewriterEndTransaction();
+    void rewriterBeginTransaction() QTC_OVERRIDE;
+    void rewriterEndTransaction() QTC_OVERRIDE;
 
-    void actualStateChanged(const ModelNode &node);
+    void actualStateChanged(const ModelNode &node) QTC_OVERRIDE;
 
     void setResourcePath(const QString &resourcePath);
 
diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.h b/src/plugins/qmldesigner/components/navigator/navigatorview.h
index 0d086284a7d..20221e51fd9 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatorview.h
+++ b/src/plugins/qmldesigner/components/navigator/navigatorview.h
@@ -61,42 +61,42 @@ public:
     WidgetInfo widgetInfo();
 
     // AbstractView
-    void modelAttached(Model *model);
-    void modelAboutToBeDetached(Model *model);
+    void modelAttached(Model *model) QTC_OVERRIDE;
+    void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
 
-    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports);
+    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
 
-    void nodeCreated(const ModelNode &createdNode);
-    void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange);
-    void propertiesRemoved(const QList<AbstractProperty> &propertyList);
-    void variantPropertiesChanged(const QList<VariantProperty> &propertyList, PropertyChangeFlags propertyChange);
-    void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags propertyChange);
+    void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
+    void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void propertiesRemoved(const QList<AbstractProperty> &propertyList) QTC_OVERRIDE;
+    void variantPropertiesChanged(const QList<VariantProperty> &propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
 
-    void nodeAboutToBeRemoved(const ModelNode &removedNode);
-    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex);
+    void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
+    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
 
-    void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange);
-    void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange);
-    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion);
-    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId);
-    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList);
+    void nodeAboutToBeReparented(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) QTC_OVERRIDE;
+    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
+    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
+    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
 
-    void selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
-                                      const QList<ModelNode> &lastSelectedNodeList);
-    void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data);
-    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList);
-    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList);
-    void instancesCompleted(const QVector<ModelNode> &completedNodeList);
-    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash);
-    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList);
-    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList);
-    void instancesChildrenChanged(const QVector<ModelNode> &nodeList);
-    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource);
+    void selectedNodesChanged(const QList<ModelNode> &selectedNodeList ,
+                                      const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
+    void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) QTC_OVERRIDE;
+    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
+    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
+    void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
+    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
+    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
 
-    void rewriterBeginTransaction();
-    void rewriterEndTransaction();
+    void rewriterBeginTransaction() QTC_OVERRIDE;
+    void rewriterEndTransaction() QTC_OVERRIDE;
 
-    void actualStateChanged(const ModelNode &node);
+    void actualStateChanged(const ModelNode &node) QTC_OVERRIDE;
 
 private slots:
 //    void handleChangedItem(QStandardItem * item);
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h
index 8d057ebba4a..899346e59d2 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h
@@ -88,30 +88,28 @@ public:
     WidgetInfo widgetInfo();
 
     void selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
-                              const QList<ModelNode> &lastSelectedNodeList);
-    void nodeAboutToBeRemoved(const ModelNode &removedNode);
+                              const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
+    void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
 
-    void propertiesAdded(const NodeState &state, const QList<NodeProperty>& propertyList);
-    void propertiesRemoved(const QList<AbstractProperty>& propertyList);
-    void propertyValuesChanged(const NodeState &state, const QList<NodeProperty>& propertyList);
+    void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
 
-    void modelAttached(Model *model);
+    void modelAttached(Model *model) QTC_OVERRIDE;
 
-    void modelAboutToBeDetached(Model *model);
+    void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
 
     ModelState modelState() const;
 
-    void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange);
-    void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange);
+    void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
 
-    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash);
+    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
 
-    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId);
-    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList);
+    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
+    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
 
     void resetView();
-    void actualStateChanged(const ModelNode &node);
-    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList);
+    void actualStateChanged(const ModelNode &node) QTC_OVERRIDE;
+    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
 
 protected:
     void timerEvent(QTimerEvent *event);
diff --git a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h
index 0b9e725f788..424bf73d459 100644
--- a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h
+++ b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h
@@ -82,38 +82,43 @@ public:
     explicit NodeInstanceView(QObject *parent = 0, NodeInstanceServerInterface::RunModus runModus = NodeInstanceServerInterface::NormalModus);
     ~NodeInstanceView();
 
-    void modelAttached(Model *model);
-    void modelAboutToBeDetached(Model *model);
-    void nodeCreated(const ModelNode &createdNode);
-    void nodeAboutToBeRemoved(const ModelNode &removedNode);
-    void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange);
-    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList);
-    void propertiesRemoved(const QList<AbstractProperty>& propertyList);
-    void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange);
-    void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange);
-    void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange);
-    void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange);
-    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion);
-    void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl);
-    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId);
-    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex);
-    void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList);
-    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList);
-    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList);
-    void instancesCompleted(const QVector<ModelNode> &completedNodeList);
-    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports);
-    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash);
-    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList);
-    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList);
-    void instancesChildrenChanged(const QVector<ModelNode> &nodeList);
-    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector);
-    void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data);
-    void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data);
-    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource);
+    void modelAttached(Model *model) QTC_OVERRIDE;
+    void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
+    void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
+    void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
+    void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+    void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+    void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void nodeAboutToBeReparented(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) QTC_OVERRIDE;
+    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
+    void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) QTC_OVERRIDE;
+    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
+    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
+    void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
+    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
+    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
+    void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
+    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
+    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
+    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
+    void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) QTC_OVERRIDE;
+    void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data) QTC_OVERRIDE;
+    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
 
 
-    void rewriterBeginTransaction();
-    void rewriterEndTransaction();
+    void rewriterBeginTransaction() QTC_OVERRIDE;
+    void rewriterEndTransaction() QTC_OVERRIDE;
 
     void actualStateChanged(const ModelNode &node);
 
diff --git a/src/plugins/qmldesigner/designercore/include/qmlmodelview.h b/src/plugins/qmldesigner/designercore/include/qmlmodelview.h
index 07077bdd014..a24059b6011 100644
--- a/src/plugins/qmldesigner/designercore/include/qmlmodelview.h
+++ b/src/plugins/qmldesigner/designercore/include/qmlmodelview.h
@@ -86,39 +86,43 @@ public:
 
     QmlObjectNode fxObjectNodeForId(const QString &id);
 
-    void modelAttached(Model *model);
-    void modelAboutToBeDetached(Model *model);
+    void modelAttached(Model *model) QTC_OVERRIDE;
+    void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
 
-    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList);
-    void instancesCompleted(const QVector<ModelNode> &completedNodeList);
-    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash);
-    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList);
-    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList);
-    void instancesChildrenChanged(const QVector<ModelNode> &nodeList);
+    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
+    void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
+    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
+    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
     void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector);
 
-    void rewriterBeginTransaction();
-    void rewriterEndTransaction();
+    void rewriterBeginTransaction() QTC_OVERRIDE;
+    void rewriterEndTransaction() QTC_OVERRIDE;
 
     void actualStateChanged(const ModelNode &node);
 
-    void nodeCreated(const ModelNode &createdNode);
-    void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange);
-    void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange);
-    void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange);
-    void propertiesAboutToBeRemoved(const QList<AbstractProperty> &propertyList);
-    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion);
-    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex);
-    void nodeAboutToBeRemoved(const ModelNode &removedNode);
-    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId);
-    void propertiesRemoved(const QList<AbstractProperty>& propertyList);
-    void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange);
-    void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange);
-    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList);
-    void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList);
+    void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
+    void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void nodeAboutToBeReparented(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) QTC_OVERRIDE;
+    void propertiesAboutToBeRemoved(const QList<AbstractProperty> &propertyList) QTC_OVERRIDE;
+    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
+    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
+    void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
+    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
+    void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+    void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
+    void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
 
-    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports);
-    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource);
+    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
+    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
 
 protected:
     NodeInstance instanceForModelNode(const ModelNode &modelNode);
diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h
index 664ea6f3c15..f79442e3b87 100644
--- a/src/plugins/qmldesigner/designercore/include/rewriterview.h
+++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h
@@ -118,46 +118,51 @@ public:
     RewriterView(DifferenceHandling differenceHandling, QObject *parent);
     ~RewriterView();
 
-    void modelAttached(Model *model);
-    void modelAboutToBeDetached(Model *model);
-    void nodeCreated(const ModelNode &createdNode);
-    void nodeAboutToBeRemoved(const ModelNode &removedNode);
-    void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange);
     void propertiesAdded(const ModelNode &node, const QList<AbstractProperty>& propertyList);
-    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList);
-    void propertiesRemoved(const QList<AbstractProperty>& propertyList);
-    void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange);
-    void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange);
-    void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange);
-    void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange);
-    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId);
-    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex);
-    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion);
-    void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data);
-    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList);
+    void modelAttached(Model *model) QTC_OVERRIDE;
+    void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
+    void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
+    void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
+    void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+    void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+    void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+    void nodeAboutToBeReparented(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) QTC_OVERRIDE;
+    void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
+    void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
+    void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
+    void customNotification(const AbstractView *view, const QString &identifier,
+                            const QList<ModelNode> &nodeList,
+                            const QList<QVariant> &data) QTC_OVERRIDE;
+    void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
 
-    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList);
-    void instancesCompleted(const QVector<ModelNode> &completedNodeList);
-    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash);
-    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList);
-    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList);
-    void instancesChildrenChanged(const QVector<ModelNode> &nodeList);
-    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector);
+    void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
+    void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
+    void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
+    void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
+    void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
 
-    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource);
+    void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
 
-    void rewriterBeginTransaction();
-    void rewriterEndTransaction();
+    void rewriterBeginTransaction() QTC_OVERRIDE;
+    void rewriterEndTransaction() QTC_OVERRIDE;
 
-    void actualStateChanged(const ModelNode &node);
+    void actualStateChanged(const ModelNode &node) QTC_OVERRIDE;
 
-    void importAdded(const Import &import);
-    void importRemoved(const Import &import);
-    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports);
 
-    void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl);
+    void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
 
-    void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList);
+    void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) QTC_OVERRIDE;
+
+    void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
 
     TextModifier *textModifier() const;
     void setTextModifier(TextModifier *textModifier);
@@ -212,6 +217,9 @@ public slots:
     void delayedSetup();
 
 protected: // functions
+    void importAdded(const Import &import);
+    void importRemoved(const Import &import);
+
     Internal::ModelToTextMerger *modelToTextMerger() const;
     Internal::TextToModelMerger *textToModelMerger() const;
     bool isModificationGroupActive() const;