From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Fri, 10 Apr 2015 08:20:09 +0000 (+0200)
Subject: Qt Designer: Introduce Q_DECL_OVERRIDE.
X-Git-Tag: v5.5.90+alpha1~20^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5dbd90b220c946f439a5806006a2665c2860bf31;p=platform%2Fupstream%2Fqttools.git

Qt Designer: Introduce Q_DECL_OVERRIDE.

Replacement done by a script and verified with clang 3.5 to not cause
new warnings.

Change-Id: Ibaa1efe91cd65a6b54591a629b7335aebc0803bf
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
---

diff --git a/src/designer/src/components/buddyeditor/buddyeditor.h b/src/designer/src/components/buddyeditor/buddyeditor.h
index f28ff26..789ca19 100644
--- a/src/designer/src/components/buddyeditor/buddyeditor.h
+++ b/src/designer/src/components/buddyeditor/buddyeditor.h
@@ -56,19 +56,19 @@ public:
     BuddyEditor(QDesignerFormWindowInterface *form, QWidget *parent);
 
     QDesignerFormWindowInterface *formWindow() const;
-    virtual void setBackground(QWidget *background);
+    void setBackground(QWidget *background) Q_DECL_OVERRIDE;
     virtual void deleteSelected();
 
 public slots:
     virtual void updateBackground();
-    virtual void widgetRemoved(QWidget *w);
+    void widgetRemoved(QWidget *w) Q_DECL_OVERRIDE;
     void autoBuddy();
 
 protected:
-    virtual QWidget *widgetAt(const QPoint &pos) const;
-    virtual Connection *createConnection(QWidget *source, QWidget *destination);
-    virtual void endConnection(QWidget *target, const QPoint &pos);
-    virtual void createContextMenu(QMenu &menu);
+    QWidget *widgetAt(const QPoint &pos) const Q_DECL_OVERRIDE;
+    Connection *createConnection(QWidget *source, QWidget *destination) Q_DECL_OVERRIDE;
+    void endConnection(QWidget *target, const QPoint &pos) Q_DECL_OVERRIDE;
+    void createContextMenu(QMenu &menu) Q_DECL_OVERRIDE;
 
 private:
     QWidget *findBuddy(QLabel *l, const QWidgetList &existingBuddies) const;
diff --git a/src/designer/src/components/buddyeditor/buddyeditor_plugin.h b/src/designer/src/components/buddyeditor/buddyeditor_plugin.h
index 32cd0da..0ce4068 100644
--- a/src/designer/src/components/buddyeditor/buddyeditor_plugin.h
+++ b/src/designer/src/components/buddyeditor/buddyeditor_plugin.h
@@ -59,11 +59,11 @@ public:
     BuddyEditorPlugin();
     virtual ~BuddyEditorPlugin();
 
-    virtual bool isInitialized() const;
-    virtual void initialize(QDesignerFormEditorInterface *core);
+    bool isInitialized() const Q_DECL_OVERRIDE;
+    void initialize(QDesignerFormEditorInterface *core) Q_DECL_OVERRIDE;
     QAction *action() const;
 
-    virtual QDesignerFormEditorInterface *core() const;
+    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
 
 public slots:
     void activeFormWindowChanged(QDesignerFormWindowInterface *formWindow);
diff --git a/src/designer/src/components/buddyeditor/buddyeditor_tool.h b/src/designer/src/components/buddyeditor/buddyeditor_tool.h
index 58d318b..e4b843f 100644
--- a/src/designer/src/components/buddyeditor/buddyeditor_tool.h
+++ b/src/designer/src/components/buddyeditor/buddyeditor_tool.h
@@ -57,16 +57,16 @@ public:
     explicit BuddyEditorTool(QDesignerFormWindowInterface *formWindow, QObject *parent = 0);
     virtual ~BuddyEditorTool();
 
-    virtual QDesignerFormEditorInterface *core() const;
-    virtual QDesignerFormWindowInterface *formWindow() const;
+    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
+    QDesignerFormWindowInterface *formWindow() const Q_DECL_OVERRIDE;
 
-    virtual QWidget *editor() const;
-    virtual QAction *action() const;
+    QWidget *editor() const Q_DECL_OVERRIDE;
+    QAction *action() const Q_DECL_OVERRIDE;
 
     virtual void activated();
     virtual void deactivated();
 
-    virtual bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event);
+    bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event) Q_DECL_OVERRIDE;
 
 private:
     QDesignerFormWindowInterface *m_formWindow;
diff --git a/src/designer/src/components/formeditor/default_actionprovider.h b/src/designer/src/components/formeditor/default_actionprovider.h
index 56358ce..6fac93c 100644
--- a/src/designer/src/components/formeditor/default_actionprovider.h
+++ b/src/designer/src/components/formeditor/default_actionprovider.h
@@ -54,7 +54,7 @@ protected:
     explicit ActionProviderBase(QWidget *widget);
 
 public:
-    virtual void adjustIndicator(const QPoint &pos);
+    void adjustIndicator(const QPoint &pos) Q_DECL_OVERRIDE;
     virtual Qt::Orientation orientation() const = 0;
 
 protected:
@@ -71,12 +71,12 @@ class QT_FORMEDITOR_EXPORT QToolBarActionProvider: public QObject, public Action
 public:
     explicit QToolBarActionProvider(QToolBar *widget, QObject *parent = 0);
 
-    virtual QRect actionGeometry(QAction *action) const;
-    virtual QAction *actionAt(const QPoint &pos) const;
+    QRect actionGeometry(QAction *action) const Q_DECL_OVERRIDE;
+    QAction *actionAt(const QPoint &pos) const Q_DECL_OVERRIDE;
     Qt::Orientation orientation() const;
 
 protected:
-    virtual QRect indicatorGeometry(const QPoint &pos, Qt::LayoutDirection layoutDirection) const;
+    QRect indicatorGeometry(const QPoint &pos, Qt::LayoutDirection layoutDirection) const Q_DECL_OVERRIDE;
 
 private:
     QToolBar *m_widget;
@@ -89,8 +89,8 @@ class QT_FORMEDITOR_EXPORT QMenuBarActionProvider: public QObject, public Action
 public:
     explicit QMenuBarActionProvider(QMenuBar *widget, QObject *parent = 0);
 
-    virtual QRect actionGeometry(QAction *action) const;
-    virtual QAction *actionAt(const QPoint &pos) const;
+    QRect actionGeometry(QAction *action) const Q_DECL_OVERRIDE;
+    QAction *actionAt(const QPoint &pos) const Q_DECL_OVERRIDE;
     Qt::Orientation orientation() const;
 
 private:
@@ -104,8 +104,8 @@ class QT_FORMEDITOR_EXPORT QMenuActionProvider: public QObject, public ActionPro
 public:
     explicit QMenuActionProvider(QMenu *widget, QObject *parent = 0);
 
-    virtual QRect actionGeometry(QAction *action) const;
-    virtual QAction *actionAt(const QPoint &pos) const;
+    QRect actionGeometry(QAction *action) const Q_DECL_OVERRIDE;
+    QAction *actionAt(const QPoint &pos) const Q_DECL_OVERRIDE;
     Qt::Orientation orientation() const;
 
 private:
diff --git a/src/designer/src/components/formeditor/default_container.h b/src/designer/src/components/formeditor/default_container.h
index a94e041..1a4a49c 100644
--- a/src/designer/src/components/formeditor/default_container.h
+++ b/src/designer/src/components/formeditor/default_container.h
@@ -60,11 +60,11 @@ public:
     virtual QWidget *widget(int index) const { return m_widget->widget(index); }
 
     virtual int currentIndex() const { return m_widget->currentIndex(); }
-    virtual void setCurrentIndex(int index);
+    void setCurrentIndex(int index) Q_DECL_OVERRIDE;
 
-    virtual void addWidget(QWidget *widget);
-    virtual void insertWidget(int index, QWidget *widget);
-    virtual void remove(int index);
+    void addWidget(QWidget *widget) Q_DECL_OVERRIDE;
+    void insertWidget(int index, QWidget *widget) Q_DECL_OVERRIDE;
+    void remove(int index) Q_DECL_OVERRIDE;
 
 private:
     QStackedWidget *m_widget;
@@ -82,11 +82,11 @@ public:
     virtual QWidget *widget(int index) const { return m_widget->widget(index); }
 
     virtual int currentIndex() const { return m_widget->currentIndex(); }
-    virtual void setCurrentIndex(int index);
+    void setCurrentIndex(int index) Q_DECL_OVERRIDE;
 
-    virtual void addWidget(QWidget *widget);
-    virtual void insertWidget(int index, QWidget *widget);
-    virtual void remove(int index);
+    void addWidget(QWidget *widget) Q_DECL_OVERRIDE;
+    void insertWidget(int index, QWidget *widget) Q_DECL_OVERRIDE;
+    void remove(int index) Q_DECL_OVERRIDE;
 
 private:
     QTabWidget *m_widget;
@@ -104,11 +104,11 @@ public:
     virtual QWidget *widget(int index) const { return m_widget->widget(index); }
 
     virtual int currentIndex() const { return m_widget->currentIndex(); }
-    virtual void setCurrentIndex(int index);
+    void setCurrentIndex(int index) Q_DECL_OVERRIDE;
 
-    virtual void addWidget(QWidget *widget);
-    virtual void insertWidget(int index, QWidget *widget);
-    virtual void remove(int index);
+    void addWidget(QWidget *widget) Q_DECL_OVERRIDE;
+    void insertWidget(int index, QWidget *widget) Q_DECL_OVERRIDE;
+    void remove(int index) Q_DECL_OVERRIDE;
 
 private:
     QToolBox *m_widget;
@@ -123,12 +123,12 @@ class SingleChildContainer: public QDesignerContainerExtension
 protected:
     explicit SingleChildContainer(Container *widget, bool active = true);
 public:
-    virtual int count() const;
-    virtual QWidget *widget(int index) const;
-    virtual int currentIndex() const;
+    int count() const Q_DECL_OVERRIDE;
+    QWidget *widget(int index) const Q_DECL_OVERRIDE;
+    int currentIndex() const Q_DECL_OVERRIDE;
     virtual void setCurrentIndex(int /*index*/) {}
-    virtual void addWidget(QWidget *widget);
-    virtual void insertWidget(int index, QWidget *widget);
+    void addWidget(QWidget *widget) Q_DECL_OVERRIDE;
+    void insertWidget(int index, QWidget *widget) Q_DECL_OVERRIDE;
     virtual void remove(int /*index*/) {}
 
     virtual bool canAddWidget() const { return false; }
diff --git a/src/designer/src/components/formeditor/default_layoutdecoration.h b/src/designer/src/components/formeditor/default_layoutdecoration.h
index 1f8b3ef..65d79ab 100644
--- a/src/designer/src/components/formeditor/default_layoutdecoration.h
+++ b/src/designer/src/components/formeditor/default_layoutdecoration.h
@@ -51,7 +51,7 @@ public:
     explicit QDesignerLayoutDecorationFactory(QExtensionManager *parent = 0);
 
 protected:
-    virtual QObject *createExtension(QObject *object, const QString &iid, QObject *parent) const;
+    QObject *createExtension(QObject *object, const QString &iid, QObject *parent) const Q_DECL_OVERRIDE;
 };
 
 }  // namespace qdesigner_internal
diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp
index 4a96ccb..8953d71 100644
--- a/src/designer/src/components/formeditor/formwindow.cpp
+++ b/src/designer/src/components/formeditor/formwindow.cpp
@@ -1475,7 +1475,7 @@ public:
                        QDesignerPropertySheetExtension *s, int i) :
                        PropertyHelper(o, sp, s, i) {}
 
-    virtual Value setValue(QDesignerFormWindowInterface *fw, const QVariant &value, bool changed, unsigned subPropertyMask);
+    Value setValue(QDesignerFormWindowInterface *fw, const QVariant &value, bool changed, unsigned subPropertyMask) Q_DECL_OVERRIDE;
 };
 
 PropertyHelper::Value ArrowKeyPropertyHelper::setValue(QDesignerFormWindowInterface *fw, const QVariant &value, bool changed, unsigned subPropertyMask)
@@ -1501,7 +1501,7 @@ protected:
     virtual PropertyHelper *createPropertyHelper(QObject *o, SpecialProperty sp,
                                                  QDesignerPropertySheetExtension *s, int i) const
         { return new ArrowKeyPropertyHelper(o, sp, s, i); }
-    virtual QVariant mergeValue(const QVariant &newValue);
+    QVariant mergeValue(const QVariant &newValue) Q_DECL_OVERRIDE;
 };
 
 ArrowKeyPropertyCommand::ArrowKeyPropertyCommand(QDesignerFormWindowInterface *fw,
diff --git a/src/designer/src/components/formeditor/formwindow.h b/src/designer/src/components/formeditor/formwindow.h
index 4dd047c..01a8f2d 100644
--- a/src/designer/src/components/formeditor/formwindow.h
+++ b/src/designer/src/components/formeditor/formwindow.h
@@ -78,54 +78,54 @@ public:
     explicit FormWindow(FormEditor *core, QWidget *parent = 0, Qt::WindowFlags flags = 0);
     virtual ~FormWindow();
 
-    virtual QDesignerFormEditorInterface *core() const;
+    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
 
-    virtual QDesignerFormWindowCursorInterface *cursor() const;
+    QDesignerFormWindowCursorInterface *cursor() const Q_DECL_OVERRIDE;
 
     // Overwritten: FormWindowBase
-    virtual QWidget *formContainer() const;
+    QWidget *formContainer() const Q_DECL_OVERRIDE;
 
-    virtual int toolCount() const;
-    virtual int currentTool() const;
-    virtual void setCurrentTool(int index);
-    virtual QDesignerFormWindowToolInterface *tool(int index) const;
-    virtual void registerTool(QDesignerFormWindowToolInterface *tool);
+    int toolCount() const Q_DECL_OVERRIDE;
+    int currentTool() const Q_DECL_OVERRIDE;
+    void setCurrentTool(int index) Q_DECL_OVERRIDE;
+    QDesignerFormWindowToolInterface *tool(int index) const Q_DECL_OVERRIDE;
+    void registerTool(QDesignerFormWindowToolInterface *tool) Q_DECL_OVERRIDE;
 
-    virtual QString author() const;
-    virtual void setAuthor(const QString &author);
+    QString author() const Q_DECL_OVERRIDE;
+    void setAuthor(const QString &author) Q_DECL_OVERRIDE;
 
-    virtual QString comment() const;
-    virtual void setComment(const QString &comment);
+    QString comment() const Q_DECL_OVERRIDE;
+    void setComment(const QString &comment) Q_DECL_OVERRIDE;
 
-    virtual void layoutDefault(int *margin, int *spacing);
-    virtual void setLayoutDefault(int margin, int spacing);
+    void layoutDefault(int *margin, int *spacing) Q_DECL_OVERRIDE;
+    void setLayoutDefault(int margin, int spacing) Q_DECL_OVERRIDE;
 
-    virtual void layoutFunction(QString *margin, QString *spacing);
-    virtual void setLayoutFunction(const QString &margin, const QString &spacing);
+    void layoutFunction(QString *margin, QString *spacing) Q_DECL_OVERRIDE;
+    void setLayoutFunction(const QString &margin, const QString &spacing) Q_DECL_OVERRIDE;
 
-    virtual QString pixmapFunction() const;
-    virtual void setPixmapFunction(const QString &pixmapFunction);
+    QString pixmapFunction() const Q_DECL_OVERRIDE;
+    void setPixmapFunction(const QString &pixmapFunction) Q_DECL_OVERRIDE;
 
-    virtual QString exportMacro() const;
-    virtual void setExportMacro(const QString &exportMacro);
+    QString exportMacro() const Q_DECL_OVERRIDE;
+    void setExportMacro(const QString &exportMacro) Q_DECL_OVERRIDE;
 
-    virtual QStringList includeHints() const;
-    virtual void setIncludeHints(const QStringList &includeHints);
+    QStringList includeHints() const Q_DECL_OVERRIDE;
+    void setIncludeHints(const QStringList &includeHints) Q_DECL_OVERRIDE;
 
-    virtual QString fileName() const;
-    virtual void setFileName(const QString &fileName);
+    QString fileName() const Q_DECL_OVERRIDE;
+    void setFileName(const QString &fileName) Q_DECL_OVERRIDE;
 
-    virtual QString contents() const;
-    virtual bool setContents(QIODevice *dev, QString *errorMessage = 0);
-    virtual bool setContents(const QString &);
+    QString contents() const Q_DECL_OVERRIDE;
+    bool setContents(QIODevice *dev, QString *errorMessage = 0) Q_DECL_OVERRIDE;
+    bool setContents(const QString &) Q_DECL_OVERRIDE;
 
-    virtual QDir absoluteDir() const;
+    QDir absoluteDir() const Q_DECL_OVERRIDE;
 
-    virtual void simplifySelection(QWidgetList *sel) const;
+    void simplifySelection(QWidgetList *sel) const Q_DECL_OVERRIDE;
 
-    virtual void ensureUniqueObjectName(QObject *object);
+    void ensureUniqueObjectName(QObject *object) Q_DECL_OVERRIDE;
 
-    virtual QWidget *mainContainer() const;
+    QWidget *mainContainer() const Q_DECL_OVERRIDE;
     void setMainContainer(QWidget *mainContainer);
     bool isMainContainer(const QWidget *w) const;
 
@@ -158,11 +158,11 @@ public:
     void manageWidget(QWidget *w);
     void unmanageWidget(QWidget *w);
 
-    virtual QUndoStack *commandHistory() const;
+    QUndoStack *commandHistory() const Q_DECL_OVERRIDE;
     void beginCommand(const QString &description);
     void endCommand();
 
-    virtual bool blockSelectionChanged(bool blocked);
+    bool blockSelectionChanged(bool blocked) Q_DECL_OVERRIDE;
     virtual void emitSelectionChanged();
 
     bool unify(QObject *w, QString &s, bool changeIt);
@@ -173,7 +173,7 @@ public:
     static FormWindow *findFormWindow(QWidget *w);
 
     virtual QWidget *containerAt(const QPoint &pos);
-    virtual QWidget *widgetAt(const QPoint &pos);
+    QWidget *widgetAt(const QPoint &pos) Q_DECL_OVERRIDE;
     virtual void highlightWidget(QWidget *w, const QPoint &pos,
                                     HighlightMode mode = Highlight);
 
@@ -191,7 +191,7 @@ public:
     bool dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, QWidget *target,
                         const QPoint &global_mouse_pos);
 
-    virtual QWidget *findContainer(QWidget *w, bool excludeLayout) const;
+    QWidget *findContainer(QWidget *w, bool excludeLayout) const Q_DECL_OVERRIDE;
     // for WidgetSelection only.
     QWidget *designerWidget(QWidget *w) const;
 
@@ -199,7 +199,7 @@ public:
     QMenu *initializePopupMenu(QWidget *managedWidget);
 
 #ifndef QT_NO_CLIPBOARD
-    virtual void paste(PasteMode pasteMode);
+    void paste(PasteMode pasteMode) Q_DECL_OVERRIDE;
 #endif
     virtual QEditorFormBuilder *createFormBuilder();
 
@@ -227,7 +227,7 @@ public slots:
 
 protected:
     virtual QMenu *createPopupMenu(QWidget *w);
-    virtual void resizeEvent(QResizeEvent *e);
+    void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE;
 
     void insertWidget(QWidget *w, const QRect &rect, QWidget *target, bool already_in_form = false);
 
diff --git a/src/designer/src/components/formeditor/formwindow_dnditem.h b/src/designer/src/components/formeditor/formwindow_dnditem.h
index 4295266..dbd01fe 100644
--- a/src/designer/src/components/formeditor/formwindow_dnditem.h
+++ b/src/designer/src/components/formeditor/formwindow_dnditem.h
@@ -47,7 +47,7 @@ class FormWindowDnDItem : public QDesignerDnDItem
 public:
     FormWindowDnDItem(QDesignerDnDItemInterface::DropType type, FormWindow *form,
                         QWidget *widget, const QPoint &global_mouse_pos);
-    virtual DomUI *domUi() const;
+    DomUI *domUi() const Q_DECL_OVERRIDE;
 };
 
 }  // namespace qdesigner_internal
diff --git a/src/designer/src/components/formeditor/formwindowcursor.h b/src/designer/src/components/formeditor/formwindowcursor.h
index 62f5a1d..c5eae60 100644
--- a/src/designer/src/components/formeditor/formwindowcursor.h
+++ b/src/designer/src/components/formeditor/formwindowcursor.h
@@ -51,25 +51,25 @@ public:
     explicit FormWindowCursor(FormWindow *fw, QObject *parent = 0);
     virtual ~FormWindowCursor();
 
-    virtual QDesignerFormWindowInterface *formWindow() const;
+    QDesignerFormWindowInterface *formWindow() const Q_DECL_OVERRIDE;
 
-    virtual bool movePosition(MoveOperation op, MoveMode mode);
+    bool movePosition(MoveOperation op, MoveMode mode) Q_DECL_OVERRIDE;
 
-    virtual int position() const;
-    virtual void setPosition(int pos, MoveMode mode);
+    int position() const Q_DECL_OVERRIDE;
+    void setPosition(int pos, MoveMode mode) Q_DECL_OVERRIDE;
 
-    virtual QWidget *current() const;
+    QWidget *current() const Q_DECL_OVERRIDE;
 
-    virtual int widgetCount() const;
-    virtual QWidget *widget(int index) const;
+    int widgetCount() const Q_DECL_OVERRIDE;
+    QWidget *widget(int index) const Q_DECL_OVERRIDE;
 
-    virtual bool hasSelection() const;
-    virtual int selectedWidgetCount() const;
-    virtual QWidget *selectedWidget(int index) const;
+    bool hasSelection() const Q_DECL_OVERRIDE;
+    int selectedWidgetCount() const Q_DECL_OVERRIDE;
+    QWidget *selectedWidget(int index) const Q_DECL_OVERRIDE;
 
-    virtual void setProperty(const QString &name, const QVariant &value);
-    virtual void setWidgetProperty(QWidget *widget, const QString &name, const QVariant &value);
-    virtual void resetWidgetProperty(QWidget *widget, const QString &name);
+    void setProperty(const QString &name, const QVariant &value) Q_DECL_OVERRIDE;
+    void setWidgetProperty(QWidget *widget, const QString &name, const QVariant &value) Q_DECL_OVERRIDE;
+    void resetWidgetProperty(QWidget *widget, const QString &name) Q_DECL_OVERRIDE;
 
 public slots:
     void update();
diff --git a/src/designer/src/components/formeditor/formwindowmanager.h b/src/designer/src/components/formeditor/formwindowmanager.h
index 1bb1b2a..307c658 100644
--- a/src/designer/src/components/formeditor/formwindowmanager.h
+++ b/src/designer/src/components/formeditor/formwindowmanager.h
@@ -65,10 +65,10 @@ public:
     explicit FormWindowManager(QDesignerFormEditorInterface *core, QObject *parent = 0);
     virtual ~FormWindowManager();
 
-    virtual QDesignerFormEditorInterface *core() const;
+    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
 
-    virtual QAction *action(Action action) const;
-    virtual QActionGroup *actionGroup(ActionGroup actionGroup) const;
+    QAction *action(Action action) const Q_DECL_OVERRIDE;
+    QActionGroup *actionGroup(ActionGroup actionGroup) const Q_DECL_OVERRIDE;
 
     QDesignerFormWindowInterface *activeFormWindow() const;
 
diff --git a/src/designer/src/components/formeditor/itemview_propertysheet.h b/src/designer/src/components/formeditor/itemview_propertysheet.h
index f5a1cb7..20ab7d8 100644
--- a/src/designer/src/components/formeditor/itemview_propertysheet.h
+++ b/src/designer/src/components/formeditor/itemview_propertysheet.h
@@ -61,11 +61,11 @@ public:
     QVariant property(int index) const;
     void setProperty(int index, const QVariant &value);
 
-    virtual void setChanged(int index, bool changed);
-    virtual bool isChanged(int index) const;
+    void setChanged(int index, bool changed) Q_DECL_OVERRIDE;
+    bool isChanged(int index) const Q_DECL_OVERRIDE;
 
-    virtual bool hasReset(int index) const;
-    virtual bool reset(int index);
+    bool hasReset(int index) const Q_DECL_OVERRIDE;
+    bool reset(int index) Q_DECL_OVERRIDE;
 
 private:
     void initHeaderProperties(QHeaderView *hv, const QString &prefix);
diff --git a/src/designer/src/components/formeditor/layout_propertysheet.h b/src/designer/src/components/formeditor/layout_propertysheet.h
index c65a19c..4106639 100644
--- a/src/designer/src/components/formeditor/layout_propertysheet.h
+++ b/src/designer/src/components/formeditor/layout_propertysheet.h
@@ -54,9 +54,9 @@ public:
     explicit LayoutPropertySheet(QLayout *object, QObject *parent = 0);
     virtual ~LayoutPropertySheet();
 
-    virtual void setProperty(int index, const QVariant &value);
-    virtual QVariant property(int index) const;
-    virtual bool reset(int index);
+    void setProperty(int index, const QVariant &value) Q_DECL_OVERRIDE;
+    QVariant property(int index) const Q_DECL_OVERRIDE;
+    bool reset(int index) Q_DECL_OVERRIDE;
     void setChanged(int index, bool changed);
 
     static void stretchAttributesToDom(QDesignerFormEditorInterface *core, QLayout *lt, DomLayout *domLayout);
diff --git a/src/designer/src/components/formeditor/line_propertysheet.h b/src/designer/src/components/formeditor/line_propertysheet.h
index b961fb3..3244f8a 100644
--- a/src/designer/src/components/formeditor/line_propertysheet.h
+++ b/src/designer/src/components/formeditor/line_propertysheet.h
@@ -50,9 +50,9 @@ public:
     explicit LinePropertySheet(Line *object, QObject *parent = 0);
     virtual ~LinePropertySheet();
 
-    virtual void setProperty(int index, const QVariant &value);
-    virtual bool isVisible(int index) const;
-    virtual QString propertyGroup(int index) const;
+    void setProperty(int index, const QVariant &value) Q_DECL_OVERRIDE;
+    bool isVisible(int index) const Q_DECL_OVERRIDE;
+    QString propertyGroup(int index) const Q_DECL_OVERRIDE;
 };
 
 typedef QDesignerPropertySheetFactory<Line, LinePropertySheet> LinePropertySheetFactory;
diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp
index c040d68..b1e9fdc 100644
--- a/src/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -135,13 +135,13 @@ public:
     QStringList loadedQrcFiles() const                    { return m_loadedQrcFiles.keys(); } // needed only for loading old resource attribute of <iconset> tag.
 #endif
 
-    virtual QVariant loadResource(const QDir &workingDirectory, const DomProperty *icon) const;
+    QVariant loadResource(const QDir &workingDirectory, const DomProperty *icon) const Q_DECL_OVERRIDE;
 
-    virtual QVariant toNativeValue(const QVariant &value) const;
+    QVariant toNativeValue(const QVariant &value) const Q_DECL_OVERRIDE;
 
-    virtual DomProperty *saveResource(const QDir &workingDirectory, const QVariant &value) const;
+    DomProperty *saveResource(const QDir &workingDirectory, const QVariant &value) const Q_DECL_OVERRIDE;
 
-    virtual bool isResourceType(const QVariant &value) const;
+    bool isResourceType(const QVariant &value) const Q_DECL_OVERRIDE;
 private:
 
     QDesignerFormEditorInterface *m_core;
@@ -364,11 +364,11 @@ class QDesignerTextBuilder : public QTextBuilder
 public:
     QDesignerTextBuilder() {}
 
-    virtual QVariant loadText(const DomProperty *icon) const;
+    QVariant loadText(const DomProperty *icon) const Q_DECL_OVERRIDE;
 
-    virtual QVariant toNativeValue(const QVariant &value) const;
+    QVariant toNativeValue(const QVariant &value) const Q_DECL_OVERRIDE;
 
-    virtual DomProperty *saveText(const QVariant &value) const;
+    DomProperty *saveText(const QVariant &value) const Q_DECL_OVERRIDE;
 };
 
 QVariant QDesignerTextBuilder::loadText(const DomProperty *text) const
diff --git a/src/designer/src/components/formeditor/qdesigner_resource.h b/src/designer/src/components/formeditor/qdesigner_resource.h
index a0a9fe2..cb8be23 100644
--- a/src/designer/src/components/formeditor/qdesigner_resource.h
+++ b/src/designer/src/components/formeditor/qdesigner_resource.h
@@ -70,57 +70,57 @@ public:
     explicit QDesignerResource(FormWindow *fw);
     virtual ~QDesignerResource();
 
-    virtual void save(QIODevice *dev, QWidget *widget);
+    void save(QIODevice *dev, QWidget *widget) Q_DECL_OVERRIDE;
 
-    virtual bool copy(QIODevice *dev, const FormBuilderClipboard &selection);
-    virtual DomUI *copy(const FormBuilderClipboard &selection);
+    bool copy(QIODevice *dev, const FormBuilderClipboard &selection) Q_DECL_OVERRIDE;
+    DomUI *copy(const FormBuilderClipboard &selection) Q_DECL_OVERRIDE;
 
-    virtual FormBuilderClipboard paste(DomUI *ui, QWidget *widgetParent, QObject *actionParent = 0);
-    virtual FormBuilderClipboard paste(QIODevice *dev,  QWidget *widgetParent, QObject *actionParent = 0);
+    FormBuilderClipboard paste(DomUI *ui, QWidget *widgetParent, QObject *actionParent = 0) Q_DECL_OVERRIDE;
+    FormBuilderClipboard paste(QIODevice *dev,  QWidget *widgetParent, QObject *actionParent = 0) Q_DECL_OVERRIDE;
 
     bool saveRelative() const;
     void setSaveRelative(bool relative);
 
-    virtual QWidget *load(QIODevice *dev, QWidget *parentWidget);
+    QWidget *load(QIODevice *dev, QWidget *parentWidget) Q_DECL_OVERRIDE;
 
 protected:
     using QEditorFormBuilder::create;
     using QEditorFormBuilder::createDom;
 
-    virtual void saveDom(DomUI *ui, QWidget *widget);
-    virtual QWidget *create(DomUI *ui, QWidget *parentWidget);
-    virtual QWidget *create(DomWidget *ui_widget, QWidget *parentWidget);
-    virtual QLayout *create(DomLayout *ui_layout, QLayout *layout, QWidget *parentWidget);
-    virtual QLayoutItem *create(DomLayoutItem *ui_layoutItem, QLayout *layout, QWidget *parentWidget);
-    virtual void applyProperties(QObject *o, const QList<DomProperty*> &properties);
-    virtual QList<DomProperty*> computeProperties(QObject *obj);
-    virtual DomProperty *createProperty(QObject *object, const QString &propertyName, const QVariant &value);
+    void saveDom(DomUI *ui, QWidget *widget) Q_DECL_OVERRIDE;
+    QWidget *create(DomUI *ui, QWidget *parentWidget) Q_DECL_OVERRIDE;
+    QWidget *create(DomWidget *ui_widget, QWidget *parentWidget) Q_DECL_OVERRIDE;
+    QLayout *create(DomLayout *ui_layout, QLayout *layout, QWidget *parentWidget) Q_DECL_OVERRIDE;
+    QLayoutItem *create(DomLayoutItem *ui_layoutItem, QLayout *layout, QWidget *parentWidget) Q_DECL_OVERRIDE;
+    void applyProperties(QObject *o, const QList<DomProperty*> &properties) Q_DECL_OVERRIDE;
+    QList<DomProperty*> computeProperties(QObject *obj) Q_DECL_OVERRIDE;
+    DomProperty *createProperty(QObject *object, const QString &propertyName, const QVariant &value) Q_DECL_OVERRIDE;
 
-    virtual QWidget *createWidget(const QString &widgetName, QWidget *parentWidget, const QString &name);
-    virtual QLayout *createLayout(const QString &layoutName, QObject *parent, const QString &name);
-    virtual void createCustomWidgets(DomCustomWidgets *);
-    virtual void createResources(DomResources*);
-    virtual void applyTabStops(QWidget *widget, DomTabStops *tabStops);
+    QWidget *createWidget(const QString &widgetName, QWidget *parentWidget, const QString &name) Q_DECL_OVERRIDE;
+    QLayout *createLayout(const QString &layoutName, QObject *parent, const QString &name) Q_DECL_OVERRIDE;
+    void createCustomWidgets(DomCustomWidgets *) Q_DECL_OVERRIDE;
+    void createResources(DomResources*) Q_DECL_OVERRIDE;
+    void applyTabStops(QWidget *widget, DomTabStops *tabStops) Q_DECL_OVERRIDE;
 
-    virtual bool addItem(DomLayoutItem *ui_item, QLayoutItem *item, QLayout *layout);
-    virtual bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget);
+    bool addItem(DomLayoutItem *ui_item, QLayoutItem *item, QLayout *layout) Q_DECL_OVERRIDE;
+    bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) Q_DECL_OVERRIDE;
 
-    virtual DomWidget *createDom(QWidget *widget, DomWidget *ui_parentWidget, bool recursive = true);
-    virtual DomLayout *createDom(QLayout *layout, DomLayout *ui_layout, DomWidget *ui_parentWidget);
-    virtual DomLayoutItem *createDom(QLayoutItem *item, DomLayout *ui_layout, DomWidget *ui_parentWidget);
+    DomWidget *createDom(QWidget *widget, DomWidget *ui_parentWidget, bool recursive = true) Q_DECL_OVERRIDE;
+    DomLayout *createDom(QLayout *layout, DomLayout *ui_layout, DomWidget *ui_parentWidget) Q_DECL_OVERRIDE;
+    DomLayoutItem *createDom(QLayoutItem *item, DomLayout *ui_layout, DomWidget *ui_parentWidget) Q_DECL_OVERRIDE;
 
-    virtual QAction *create(DomAction *ui_action, QObject *parent);
-    virtual QActionGroup *create(DomActionGroup *ui_action_group, QObject *parent);
-    virtual void addMenuAction(QAction *action);
+    QAction *create(DomAction *ui_action, QObject *parent) Q_DECL_OVERRIDE;
+    QActionGroup *create(DomActionGroup *ui_action_group, QObject *parent) Q_DECL_OVERRIDE;
+    void addMenuAction(QAction *action) Q_DECL_OVERRIDE;
 
-    virtual DomAction *createDom(QAction *action);
-    virtual DomActionGroup *createDom(QActionGroup *actionGroup);
-    virtual DomActionRef *createActionRefDom(QAction *action);
+    DomAction *createDom(QAction *action) Q_DECL_OVERRIDE;
+    DomActionGroup *createDom(QActionGroup *actionGroup) Q_DECL_OVERRIDE;
+    DomActionRef *createActionRefDom(QAction *action) Q_DECL_OVERRIDE;
 
-    virtual QAction *createAction(QObject *parent, const QString &name);
-    virtual QActionGroup *createActionGroup(QObject *parent, const QString &name);
+    QAction *createAction(QObject *parent, const QString &name) Q_DECL_OVERRIDE;
+    QActionGroup *createActionGroup(QObject *parent, const QString &name) Q_DECL_OVERRIDE;
 
-    virtual bool checkProperty(QObject *obj, const QString &prop) const;
+    bool checkProperty(QObject *obj, const QString &prop) const Q_DECL_OVERRIDE;
 
     DomWidget *saveWidget(QTabWidget *widget, DomWidget *ui_parentWidget);
     DomWidget *saveWidget(QStackedWidget *widget, DomWidget *ui_parentWidget);
@@ -134,9 +134,9 @@ protected:
     virtual DomTabStops *saveTabStops();
     virtual DomResources *saveResources();
 
-    virtual void layoutInfo(DomLayout *layout, QObject *parent, int *margin, int *spacing);
+    void layoutInfo(DomLayout *layout, QObject *parent, int *margin, int *spacing) Q_DECL_OVERRIDE;
 
-    virtual void loadExtraInfo(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget);
+    void loadExtraInfo(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) Q_DECL_OVERRIDE;
 
     void changeObjectName(QObject *o, QString name);
     DomProperty *applyProperStdSetAttribute(QObject *object, const QString &propertyName, DomProperty *property);
diff --git a/src/designer/src/components/formeditor/qlayoutwidget_propertysheet.h b/src/designer/src/components/formeditor/qlayoutwidget_propertysheet.h
index 56b03bb..a8453b8 100644
--- a/src/designer/src/components/formeditor/qlayoutwidget_propertysheet.h
+++ b/src/designer/src/components/formeditor/qlayoutwidget_propertysheet.h
@@ -50,10 +50,10 @@ public:
     explicit QLayoutWidgetPropertySheet(QLayoutWidget *object, QObject *parent = 0);
     virtual ~QLayoutWidgetPropertySheet();
 
-    virtual void setProperty(int index, const QVariant &value);
-    virtual bool isVisible(int index) const;
+    void setProperty(int index, const QVariant &value) Q_DECL_OVERRIDE;
+    bool isVisible(int index) const Q_DECL_OVERRIDE;
 
-    virtual bool dynamicPropertiesAllowed() const;
+    bool dynamicPropertiesAllowed() const Q_DECL_OVERRIDE;
 };
 
 typedef QDesignerPropertySheetFactory<QLayoutWidget, QLayoutWidgetPropertySheet> QLayoutWidgetPropertySheetFactory;
diff --git a/src/designer/src/components/formeditor/qmainwindow_container.h b/src/designer/src/components/formeditor/qmainwindow_container.h
index 5406809..d8cf37f 100644
--- a/src/designer/src/components/formeditor/qmainwindow_container.h
+++ b/src/designer/src/components/formeditor/qmainwindow_container.h
@@ -52,13 +52,13 @@ class QMainWindowContainer: public QObject, public QDesignerContainerExtension
 public:
     explicit QMainWindowContainer(QMainWindow *widget, QObject *parent = 0);
 
-    virtual int count() const;
-    virtual QWidget *widget(int index) const;
-    virtual int currentIndex() const;
-    virtual void setCurrentIndex(int index);
-    virtual void addWidget(QWidget *widget);
-    virtual void insertWidget(int index, QWidget *widget);
-    virtual void remove(int index);
+    int count() const Q_DECL_OVERRIDE;
+    QWidget *widget(int index) const Q_DECL_OVERRIDE;
+    int currentIndex() const Q_DECL_OVERRIDE;
+    void setCurrentIndex(int index) Q_DECL_OVERRIDE;
+    void addWidget(QWidget *widget) Q_DECL_OVERRIDE;
+    void insertWidget(int index, QWidget *widget) Q_DECL_OVERRIDE;
+    void remove(int index) Q_DECL_OVERRIDE;
 
 private:
     QMainWindow *m_mainWindow;
diff --git a/src/designer/src/components/formeditor/qmdiarea_container.h b/src/designer/src/components/formeditor/qmdiarea_container.h
index 8538dc5..df8bc5e 100644
--- a/src/designer/src/components/formeditor/qmdiarea_container.h
+++ b/src/designer/src/components/formeditor/qmdiarea_container.h
@@ -54,13 +54,13 @@ class QMdiAreaContainer: public QObject, public QDesignerContainerExtension
 public:
     explicit QMdiAreaContainer(QMdiArea *widget, QObject *parent = 0);
 
-    virtual int count() const;
-    virtual QWidget *widget(int index) const;
-    virtual int currentIndex() const;
-    virtual void setCurrentIndex(int index);
-    virtual void addWidget(QWidget *widget);
-    virtual void insertWidget(int index, QWidget *widget);
-    virtual void remove(int index);
+    int count() const Q_DECL_OVERRIDE;
+    QWidget *widget(int index) const Q_DECL_OVERRIDE;
+    int currentIndex() const Q_DECL_OVERRIDE;
+    void setCurrentIndex(int index) Q_DECL_OVERRIDE;
+    void addWidget(QWidget *widget) Q_DECL_OVERRIDE;
+    void insertWidget(int index, QWidget *widget) Q_DECL_OVERRIDE;
+    void remove(int index) Q_DECL_OVERRIDE;
 
     // Semismart positioning of a new MDI child after cascading
     static void positionNewMdiChild(const QWidget *area, QWidget *mdiChild);
@@ -78,11 +78,11 @@ class QMdiAreaPropertySheet: public QDesignerPropertySheet
 public:
     explicit QMdiAreaPropertySheet(QWidget *mdiArea, QObject *parent = 0);
 
-    virtual void setProperty(int index, const QVariant &value);
-    virtual bool reset(int index);
-    virtual bool isEnabled(int index) const;
-    virtual bool isChanged(int index) const;
-    virtual QVariant property(int index) const;
+    void setProperty(int index, const QVariant &value) Q_DECL_OVERRIDE;
+    bool reset(int index) Q_DECL_OVERRIDE;
+    bool isEnabled(int index) const Q_DECL_OVERRIDE;
+    bool isChanged(int index) const Q_DECL_OVERRIDE;
+    QVariant property(int index) const Q_DECL_OVERRIDE;
 
     // Check whether the property is to be saved. Returns false for the page
     // properties (as the property sheet has no concept of 'stored')
diff --git a/src/designer/src/components/formeditor/qwizard_container.h b/src/designer/src/components/formeditor/qwizard_container.h
index c1ab3af..6181371 100644
--- a/src/designer/src/components/formeditor/qwizard_container.h
+++ b/src/designer/src/components/formeditor/qwizard_container.h
@@ -58,13 +58,13 @@ class QWizardContainer: public QObject, public QDesignerContainerExtension
 public:
     explicit QWizardContainer(QWizard *widget, QObject *parent = 0);
 
-    virtual int count() const;
-    virtual QWidget *widget(int index) const;
-    virtual int currentIndex() const;
-    virtual void setCurrentIndex(int index);
-    virtual void addWidget(QWidget *widget);
-    virtual void insertWidget(int index, QWidget *widget);
-    virtual void remove(int index);
+    int count() const Q_DECL_OVERRIDE;
+    QWidget *widget(int index) const Q_DECL_OVERRIDE;
+    int currentIndex() const Q_DECL_OVERRIDE;
+    void setCurrentIndex(int index) Q_DECL_OVERRIDE;
+    void addWidget(QWidget *widget) Q_DECL_OVERRIDE;
+    void insertWidget(int index, QWidget *widget) Q_DECL_OVERRIDE;
+    void remove(int index) Q_DECL_OVERRIDE;
 
 private:
     QWizard *m_wizard;
@@ -81,7 +81,7 @@ class QWizardPagePropertySheet: public QDesignerPropertySheet
 public:
     explicit QWizardPagePropertySheet(QWizardPage *object, QObject *parent = 0);
 
-    virtual bool reset(int index);
+    bool reset(int index) Q_DECL_OVERRIDE;
 
     static const char *pageIdProperty;
 
@@ -98,7 +98,7 @@ class QWizardPropertySheet: public QDesignerPropertySheet
     Q_OBJECT
 public:
     explicit QWizardPropertySheet(QWizard *object, QObject *parent = 0);
-    virtual bool isVisible(int index) const;
+    bool isVisible(int index) const Q_DECL_OVERRIDE;
 
 private:
     const QString m_startId;
diff --git a/src/designer/src/components/formeditor/spacer_propertysheet.h b/src/designer/src/components/formeditor/spacer_propertysheet.h
index 8f8749b..137aba9 100644
--- a/src/designer/src/components/formeditor/spacer_propertysheet.h
+++ b/src/designer/src/components/formeditor/spacer_propertysheet.h
@@ -50,10 +50,10 @@ public:
     explicit SpacerPropertySheet(Spacer *object, QObject *parent = 0);
     virtual ~SpacerPropertySheet();
 
-    virtual void setProperty(int index, const QVariant &value);
-    virtual bool isVisible(int index) const;
+    void setProperty(int index, const QVariant &value) Q_DECL_OVERRIDE;
+    bool isVisible(int index) const Q_DECL_OVERRIDE;
 
-    virtual bool dynamicPropertiesAllowed() const;
+    bool dynamicPropertiesAllowed() const Q_DECL_OVERRIDE;
 };
 
 typedef QDesignerPropertySheetFactory<Spacer, SpacerPropertySheet> SpacerPropertySheetFactory;
diff --git a/src/designer/src/components/formeditor/templateoptionspage.h b/src/designer/src/components/formeditor/templateoptionspage.h
index b45c1f7..fa25ae2 100644
--- a/src/designer/src/components/formeditor/templateoptionspage.h
+++ b/src/designer/src/components/formeditor/templateoptionspage.h
@@ -84,8 +84,8 @@ class TemplateOptionsPage : public QDesignerOptionsPageInterface
 public:
     explicit TemplateOptionsPage(QDesignerFormEditorInterface *core);
 
-    virtual QString name() const;
-    virtual QWidget *createPage(QWidget *parent);
+    QString name() const Q_DECL_OVERRIDE;
+    QWidget *createPage(QWidget *parent) Q_DECL_OVERRIDE;
     virtual void apply();
     virtual void finish();
 
diff --git a/src/designer/src/components/formeditor/tool_widgeteditor.h b/src/designer/src/components/formeditor/tool_widgeteditor.h
index b703216..68686f8 100644
--- a/src/designer/src/components/formeditor/tool_widgeteditor.h
+++ b/src/designer/src/components/formeditor/tool_widgeteditor.h
@@ -56,15 +56,15 @@ public:
     explicit WidgetEditorTool(FormWindow *formWindow);
     virtual ~WidgetEditorTool();
 
-    virtual QDesignerFormEditorInterface *core() const;
-    virtual QDesignerFormWindowInterface *formWindow() const;
-    virtual QWidget *editor() const;
-    virtual QAction *action() const;
+    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
+    QDesignerFormWindowInterface *formWindow() const Q_DECL_OVERRIDE;
+    QWidget *editor() const Q_DECL_OVERRIDE;
+    QAction *action() const Q_DECL_OVERRIDE;
 
     virtual void activated();
     virtual void deactivated();
 
-    virtual bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event);
+    bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event) Q_DECL_OVERRIDE;
 
     bool handleContextMenu(QWidget *widget, QWidget *managedWidget, QContextMenuEvent *e);
     bool handleMouseButtonDblClickEvent(QWidget *widget, QWidget *managedWidget, QMouseEvent *e);
diff --git a/src/designer/src/components/formeditor/widgetselection.h b/src/designer/src/components/formeditor/widgetselection.h
index 97f36e1..6bae738 100644
--- a/src/designer/src/components/formeditor/widgetselection.h
+++ b/src/designer/src/components/formeditor/widgetselection.h
@@ -119,7 +119,7 @@ public:
 
     QDesignerFormEditorInterface *core() const;
 
-    virtual bool eventFilter(QObject *object, QEvent *event);
+    bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE;
 
     enum  WidgetState { UnlaidOut, LaidOut, ManagedGridLayout, ManagedFormLayout };
     static WidgetState widgetState(const QDesignerFormEditorInterface *core, QWidget *w);
diff --git a/src/designer/src/components/objectinspector/objectinspector.cpp b/src/designer/src/components/objectinspector/objectinspector.cpp
index 2d055cb..d420843 100644
--- a/src/designer/src/components/objectinspector/objectinspector.cpp
+++ b/src/designer/src/components/objectinspector/objectinspector.cpp
@@ -123,7 +123,7 @@ class ObjectInspectorDelegate : public QItemDelegate {
 public:
     explicit ObjectInspectorDelegate(QObject *parent = 0);
 
-    virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
+    QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
 };
 
 ObjectInspectorDelegate::ObjectInspectorDelegate(QObject *parent) :
@@ -151,8 +151,8 @@ public:
     ObjectInspectorTreeView(QWidget *parent = 0) :  QTreeView(parent) {}
 
 protected:
-    virtual void mouseMoveEvent (QMouseEvent * event);
-    virtual void keyPressEvent(QKeyEvent *event);
+    void mouseMoveEvent (QMouseEvent * event) Q_DECL_OVERRIDE;
+    void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
 
 };
 
diff --git a/src/designer/src/components/objectinspector/objectinspector.h b/src/designer/src/components/objectinspector/objectinspector.h
index cbc26af..86e3dd7 100644
--- a/src/designer/src/components/objectinspector/objectinspector.h
+++ b/src/designer/src/components/objectinspector/objectinspector.h
@@ -53,10 +53,10 @@ public:
     explicit ObjectInspector(QDesignerFormEditorInterface *core, QWidget *parent = 0);
     virtual ~ObjectInspector();
 
-    virtual QDesignerFormEditorInterface *core() const;
+    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
 
-    virtual void getSelection(Selection &s) const;
-    virtual bool selectObject(QObject *o);
+    void getSelection(Selection &s) const Q_DECL_OVERRIDE;
+    bool selectObject(QObject *o) Q_DECL_OVERRIDE;
     virtual void clearSelection();
 
     void setFormWindow(QDesignerFormWindowInterface *formWindow);
@@ -70,10 +70,10 @@ private slots:
     void slotHeaderDoubleClicked(int column);
 
 protected:
-    virtual void dragEnterEvent (QDragEnterEvent * event);
-    virtual void dragMoveEvent(QDragMoveEvent * event);
-    virtual void dragLeaveEvent(QDragLeaveEvent * event);
-    virtual void dropEvent (QDropEvent * event);
+    void dragEnterEvent (QDragEnterEvent * event) Q_DECL_OVERRIDE;
+    void dragMoveEvent(QDragMoveEvent * event) Q_DECL_OVERRIDE;
+    void dragLeaveEvent(QDragLeaveEvent * event) Q_DECL_OVERRIDE;
+    void dropEvent (QDropEvent * event) Q_DECL_OVERRIDE;
 
 private:
     class ObjectInspectorPrivate;
diff --git a/src/designer/src/components/objectinspector/objectinspectormodel_p.h b/src/designer/src/components/objectinspector/objectinspectormodel_p.h
index 8f92430..e579457 100644
--- a/src/designer/src/components/objectinspector/objectinspectormodel_p.h
+++ b/src/designer/src/components/objectinspector/objectinspectormodel_p.h
@@ -137,8 +137,8 @@ namespace qdesigner_internal {
         const QModelIndexList indexesOf(QObject *o) const { return m_objectIndexMultiMap.values(o); }
         QObject *objectAt(const QModelIndex &index) const;
 
-        virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-        virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
+        QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+        bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE;
 
     private:
         typedef QMultiMap<QObject *,QModelIndex> ObjectIndexMultiMap;
diff --git a/src/designer/src/components/propertyeditor/designerpropertymanager.h b/src/designer/src/components/propertyeditor/designerpropertymanager.h
index a055d15..8c46505 100644
--- a/src/designer/src/components/propertyeditor/designerpropertymanager.h
+++ b/src/designer/src/components/propertyeditor/designerpropertymanager.h
@@ -128,15 +128,15 @@ public:
     explicit DesignerPropertyManager(QDesignerFormEditorInterface *core, QObject *parent = 0);
     ~DesignerPropertyManager();
 
-    virtual QStringList attributes(int propertyType) const;
-    virtual int attributeType(int propertyType, const QString &attribute) const;
+    QStringList attributes(int propertyType) const Q_DECL_OVERRIDE;
+    int attributeType(int propertyType, const QString &attribute) const Q_DECL_OVERRIDE;
 
-    virtual QVariant attributeValue(const QtProperty *property, const QString &attribute) const;
-    virtual bool isPropertyTypeSupported(int propertyType) const;
-    virtual QVariant value(const QtProperty *property) const;
-    virtual int valueType(int propertyType) const;
-    virtual QString valueText(const QtProperty *property) const;
-    virtual QIcon valueIcon(const QtProperty *property) const;
+    QVariant attributeValue(const QtProperty *property, const QString &attribute) const Q_DECL_OVERRIDE;
+    bool isPropertyTypeSupported(int propertyType) const Q_DECL_OVERRIDE;
+    QVariant value(const QtProperty *property) const Q_DECL_OVERRIDE;
+    int valueType(int propertyType) const Q_DECL_OVERRIDE;
+    QString valueText(const QtProperty *property) const Q_DECL_OVERRIDE;
+    QIcon valueIcon(const QtProperty *property) const Q_DECL_OVERRIDE;
 
     bool resetFontSubProperty(QtProperty *property);
     bool resetIconSubProperty(QtProperty *subProperty);
@@ -157,14 +157,14 @@ public:
 public Q_SLOTS:
     virtual void setAttribute(QtProperty *property,
                 const QString &attribute, const QVariant &value);
-    virtual void setValue(QtProperty *property, const QVariant &value);
+    void setValue(QtProperty *property, const QVariant &value) Q_DECL_OVERRIDE;
 Q_SIGNALS:
     // sourceOfChange - a subproperty (or just property) which caused a change
     //void valueChanged(QtProperty *property, const QVariant &value, QtProperty *sourceOfChange);
     void valueChanged(QtProperty *property, const QVariant &value, bool enableSubPropertyHandling);
 protected:
-    virtual void initializeProperty(QtProperty *property);
-    virtual void uninitializeProperty(QtProperty *property);
+    void initializeProperty(QtProperty *property) Q_DECL_OVERRIDE;
+    void uninitializeProperty(QtProperty *property) Q_DECL_OVERRIDE;
 private Q_SLOTS:
     void slotValueChanged(QtProperty *property, const QVariant &value);
     void slotPropertyDestroyed(QtProperty *property);
diff --git a/src/designer/src/components/propertyeditor/paletteeditor.h b/src/designer/src/components/propertyeditor/paletteeditor.h
index 7d62103..ead06ee 100644
--- a/src/designer/src/components/propertyeditor/paletteeditor.h
+++ b/src/designer/src/components/propertyeditor/paletteeditor.h
@@ -184,7 +184,7 @@ public:
 
     virtual void paint(QPainter *painter, const QStyleOptionViewItem &opt,
                        const QModelIndex &index) const;
-    virtual QSize sizeHint(const QStyleOptionViewItem &opt, const QModelIndex &index) const;
+    QSize sizeHint(const QStyleOptionViewItem &opt, const QModelIndex &index) const Q_DECL_OVERRIDE;
 private:
     QDesignerFormEditorInterface *m_core;
 };
diff --git a/src/designer/src/components/propertyeditor/propertyeditor.h b/src/designer/src/components/propertyeditor/propertyeditor.h
index 9108c8d..545a0ff 100644
--- a/src/designer/src/components/propertyeditor/propertyeditor.h
+++ b/src/designer/src/components/propertyeditor/propertyeditor.h
@@ -71,21 +71,21 @@ public:
     explicit PropertyEditor(QDesignerFormEditorInterface *core, QWidget *parent = 0, Qt::WindowFlags flags = 0);
     virtual ~PropertyEditor();
 
-    virtual QDesignerFormEditorInterface *core() const;
+    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
 
-    virtual bool isReadOnly() const;
-    virtual void setReadOnly(bool readOnly);
-    virtual void setPropertyValue(const QString &name, const QVariant &value, bool changed = true);
+    bool isReadOnly() const Q_DECL_OVERRIDE;
+    void setReadOnly(bool readOnly) Q_DECL_OVERRIDE;
+    void setPropertyValue(const QString &name, const QVariant &value, bool changed = true) Q_DECL_OVERRIDE;
     virtual void updatePropertySheet();
 
-    virtual void setObject(QObject *object);
+    void setObject(QObject *object) Q_DECL_OVERRIDE;
 
     void reloadResourceProperties();
 
     virtual QObject *object() const
     { return m_object; }
 
-    virtual QString currentPropertyName() const;
+    QString currentPropertyName() const Q_DECL_OVERRIDE;
 
 protected:
 
diff --git a/src/designer/src/components/propertyeditor/qlonglongvalidator.h b/src/designer/src/components/propertyeditor/qlonglongvalidator.h
index 71f5284..5e07566 100644
--- a/src/designer/src/components/propertyeditor/qlonglongvalidator.h
+++ b/src/designer/src/components/propertyeditor/qlonglongvalidator.h
@@ -55,7 +55,7 @@ public:
 
     void setBottom(qlonglong);
     void setTop(qlonglong);
-    virtual void setRange(qlonglong bottom, qlonglong top);
+    void setRange(qlonglong bottom, qlonglong top);
 
     qlonglong bottom() const { return b; }
     qlonglong top() const { return t; }
@@ -83,7 +83,7 @@ public:
 
     void setBottom(qulonglong);
     void setTop(qulonglong);
-    virtual void setRange(qulonglong bottom, qulonglong top);
+    void setRange(qulonglong bottom, qulonglong top);
 
     qulonglong bottom() const { return b; }
     qulonglong top() const { return t; }
diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor.h b/src/designer/src/components/signalsloteditor/signalsloteditor.h
index 2de1aca..de7bb3c 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditor.h
+++ b/src/designer/src/components/signalsloteditor/signalsloteditor.h
@@ -55,8 +55,8 @@ public:
 
     virtual void setSignal(SignalSlotConnection *con, const QString &member);
     virtual void setSlot(SignalSlotConnection *con, const QString &member);
-    virtual void setSource(Connection *con, const QString &obj_name);
-    virtual void setTarget(Connection *con, const QString &obj_name);
+    void setSource(Connection *con, const QString &obj_name) Q_DECL_OVERRIDE;
+    void setTarget(Connection *con, const QString &obj_name) Q_DECL_OVERRIDE;
 
     DomConnections *toUi() const;
     void fromUi(const DomConnections *connections, QWidget *parent);
@@ -68,11 +68,11 @@ public:
     void addEmptyConnection();
 
 protected:
-    virtual QWidget *widgetAt(const QPoint &pos) const;
+    QWidget *widgetAt(const QPoint &pos) const Q_DECL_OVERRIDE;
 
 private:
-    virtual Connection *createConnection(QWidget *source, QWidget *destination);
-    virtual void modifyConnection(Connection *con);
+    Connection *createConnection(QWidget *source, QWidget *destination) Q_DECL_OVERRIDE;
+    void modifyConnection(Connection *con) Q_DECL_OVERRIDE;
 
     QDesignerFormWindowInterface *m_form_window;
     bool m_showAllSignalsSlots;
diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor_p.h b/src/designer/src/components/signalsloteditor/signalsloteditor_p.h
index ee9cbec..1151445 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditor_p.h
+++ b/src/designer/src/components/signalsloteditor/signalsloteditor_p.h
@@ -99,12 +99,12 @@ public:
 
     virtual QModelIndex index(int row, int column,
                               const QModelIndex &parent = QModelIndex()) const;
-    virtual QModelIndex parent(const QModelIndex &child) const;
-    virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    virtual int columnCount(const QModelIndex &parent = QModelIndex()) const;
-    virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-    virtual bool setData(const QModelIndex &index, const QVariant &data, int role = Qt::DisplayRole);
-    virtual Qt::ItemFlags flags(const QModelIndex &index) const;
+    QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+    bool setData(const QModelIndex &index, const QVariant &data, int role = Qt::DisplayRole) Q_DECL_OVERRIDE;
+    Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE;
     virtual QVariant headerData(int section, Qt::Orientation orientation,
                                 int role = Qt::DisplayRole) const;
 
diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.h b/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.h
index a1594f6..f9d8ba8 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.h
+++ b/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.h
@@ -58,11 +58,11 @@ public:
     SignalSlotEditorPlugin();
     virtual ~SignalSlotEditorPlugin();
 
-    virtual bool isInitialized() const;
-    virtual void initialize(QDesignerFormEditorInterface *core);
-    virtual QAction *action() const;
+    bool isInitialized() const Q_DECL_OVERRIDE;
+    void initialize(QDesignerFormEditorInterface *core) Q_DECL_OVERRIDE;
+    QAction *action() const Q_DECL_OVERRIDE;
 
-    virtual QDesignerFormEditorInterface *core() const;
+    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
 
 public slots:
     void activeFormWindowChanged(QDesignerFormWindowInterface *formWindow);
diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor_tool.h b/src/designer/src/components/signalsloteditor/signalsloteditor_tool.h
index 2f46692..edbc074 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditor_tool.h
+++ b/src/designer/src/components/signalsloteditor/signalsloteditor_tool.h
@@ -57,20 +57,20 @@ public:
     explicit SignalSlotEditorTool(QDesignerFormWindowInterface *formWindow, QObject *parent = 0);
     virtual ~SignalSlotEditorTool();
 
-    virtual QDesignerFormEditorInterface *core() const;
-    virtual QDesignerFormWindowInterface *formWindow() const;
+    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
+    QDesignerFormWindowInterface *formWindow() const Q_DECL_OVERRIDE;
 
-    virtual QWidget *editor() const;
+    QWidget *editor() const Q_DECL_OVERRIDE;
 
     QAction *action() const;
 
     virtual void activated();
     virtual void deactivated();
 
-    virtual bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event);
+    bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event) Q_DECL_OVERRIDE;
 
-    virtual void saveToDom(DomUI *ui, QWidget *mainContainer);
-    virtual void loadFromDom(DomUI *ui, QWidget *mainContainer);
+    void saveToDom(DomUI *ui, QWidget *mainContainer) Q_DECL_OVERRIDE;
+    void loadFromDom(DomUI *ui, QWidget *mainContainer) Q_DECL_OVERRIDE;
 
 private:
     QDesignerFormWindowInterface *m_formWindow;
diff --git a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
index c862826..ecc8a2d 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
+++ b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
@@ -418,7 +418,7 @@ public:
 
     int findText(const QString &text) const;
 
-    virtual Qt::ItemFlags flags(const QModelIndex &index) const;
+    Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE;
 };
 
 InlineEditorModel::InlineEditorModel(int rows, int cols, QObject *parent)
diff --git a/src/designer/src/components/tabordereditor/tabordereditor.h b/src/designer/src/components/tabordereditor/tabordereditor.h
index 3f45ef6..ab2b0fa 100644
--- a/src/designer/src/components/tabordereditor/tabordereditor.h
+++ b/src/designer/src/components/tabordereditor/tabordereditor.h
@@ -68,13 +68,13 @@ private slots:
     void showTabOrderDialog();
 
 protected:
-    virtual void paintEvent(QPaintEvent *e);
-    virtual void mouseMoveEvent(QMouseEvent *e);
-    virtual void mousePressEvent(QMouseEvent *e);
-    virtual void mouseDoubleClickEvent(QMouseEvent *e);
-    virtual void contextMenuEvent(QContextMenuEvent *e);
-    virtual void resizeEvent(QResizeEvent *e);
-    virtual void showEvent(QShowEvent *e);
+    void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE;
+    void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
+    void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
+    void mouseDoubleClickEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
+    void contextMenuEvent(QContextMenuEvent *e) Q_DECL_OVERRIDE;
+    void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE;
+    void showEvent(QShowEvent *e) Q_DECL_OVERRIDE;
 
 private:
     QRect indicatorRect(int index) const;
diff --git a/src/designer/src/components/tabordereditor/tabordereditor_plugin.h b/src/designer/src/components/tabordereditor/tabordereditor_plugin.h
index 40c5946..7003388 100644
--- a/src/designer/src/components/tabordereditor/tabordereditor_plugin.h
+++ b/src/designer/src/components/tabordereditor/tabordereditor_plugin.h
@@ -59,11 +59,11 @@ public:
     TabOrderEditorPlugin();
     virtual ~TabOrderEditorPlugin();
 
-    virtual bool isInitialized() const;
-    virtual void initialize(QDesignerFormEditorInterface *core);
+    bool isInitialized() const Q_DECL_OVERRIDE;
+    void initialize(QDesignerFormEditorInterface *core) Q_DECL_OVERRIDE;
     QAction *action() const;
 
-    virtual QDesignerFormEditorInterface *core() const;
+    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
 
 public slots:
     void activeFormWindowChanged(QDesignerFormWindowInterface *formWindow);
diff --git a/src/designer/src/components/tabordereditor/tabordereditor_tool.h b/src/designer/src/components/tabordereditor/tabordereditor_tool.h
index 1a0159a..958735e 100644
--- a/src/designer/src/components/tabordereditor/tabordereditor_tool.h
+++ b/src/designer/src/components/tabordereditor/tabordereditor_tool.h
@@ -57,16 +57,16 @@ public:
     explicit TabOrderEditorTool(QDesignerFormWindowInterface *formWindow, QObject *parent = 0);
     virtual ~TabOrderEditorTool();
 
-    virtual QDesignerFormEditorInterface *core() const;
-    virtual QDesignerFormWindowInterface *formWindow() const;
+    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
+    QDesignerFormWindowInterface *formWindow() const Q_DECL_OVERRIDE;
 
-    virtual QWidget *editor() const;
-    virtual QAction *action() const;
+    QWidget *editor() const Q_DECL_OVERRIDE;
+    QAction *action() const Q_DECL_OVERRIDE;
 
     virtual void activated();
     virtual void deactivated();
 
-    virtual bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event);
+    bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event) Q_DECL_OVERRIDE;
 
 private:
     QDesignerFormWindowInterface *m_formWindow;
diff --git a/src/designer/src/components/taskmenu/button_taskmenu.cpp b/src/designer/src/components/taskmenu/button_taskmenu.cpp
index 8489417..eaa56e9 100644
--- a/src/designer/src/components/taskmenu/button_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/button_taskmenu.cpp
@@ -384,7 +384,7 @@ public:
     ButtonTextTaskMenuInlineEditor(QAbstractButton *button, QObject *parent);
 
 protected:
-    virtual QRect editRectangle() const;
+    QRect editRectangle() const Q_DECL_OVERRIDE;
 };
 
 ButtonTextTaskMenuInlineEditor::ButtonTextTaskMenuInlineEditor(QAbstractButton *button, QObject *parent) :
@@ -407,7 +407,7 @@ public:
     LinkDescriptionTaskMenuInlineEditor(QAbstractButton *button, QObject *parent);
 
 protected:
-    virtual QRect editRectangle() const;
+    QRect editRectangle() const Q_DECL_OVERRIDE;
 };
 
 LinkDescriptionTaskMenuInlineEditor::LinkDescriptionTaskMenuInlineEditor(QAbstractButton *button, QObject *parent) :
diff --git a/src/designer/src/components/taskmenu/button_taskmenu.h b/src/designer/src/components/taskmenu/button_taskmenu.h
index d4d3d74..6283e13 100644
--- a/src/designer/src/components/taskmenu/button_taskmenu.h
+++ b/src/designer/src/components/taskmenu/button_taskmenu.h
@@ -88,8 +88,8 @@ class ButtonGroupTaskMenu : public QObject, public QDesignerTaskMenuExtension
 public:
     explicit ButtonGroupTaskMenu(QButtonGroup *buttonGroup, QObject *parent = 0);
 
-    virtual QAction *preferredEditAction() const;
-    virtual QList<QAction*> taskActions() const;
+    QAction *preferredEditAction() const Q_DECL_OVERRIDE;
+    QList<QAction*> taskActions() const Q_DECL_OVERRIDE;
 
 private:
     QButtonGroup *m_buttonGroup;
@@ -106,8 +106,8 @@ public:
     explicit ButtonTaskMenu(QAbstractButton *button, QObject *parent = 0);
     virtual ~ButtonTaskMenu();
 
-    virtual QAction *preferredEditAction() const;
-    virtual QList<QAction*> taskActions() const;
+    QAction *preferredEditAction() const Q_DECL_OVERRIDE;
+    QList<QAction*> taskActions() const Q_DECL_OVERRIDE;
 
     QAbstractButton *button() const;
 
diff --git a/src/designer/src/components/taskmenu/combobox_taskmenu.h b/src/designer/src/components/taskmenu/combobox_taskmenu.h
index 17a28fa..eef27df 100644
--- a/src/designer/src/components/taskmenu/combobox_taskmenu.h
+++ b/src/designer/src/components/taskmenu/combobox_taskmenu.h
@@ -55,8 +55,8 @@ public:
                               QObject *parent = 0);
     virtual ~ComboBoxTaskMenu();
 
-    virtual QAction *preferredEditAction() const;
-    virtual QList<QAction*> taskActions() const;
+    QAction *preferredEditAction() const Q_DECL_OVERRIDE;
+    QList<QAction*> taskActions() const Q_DECL_OVERRIDE;
 
 private slots:
     void editItems();
@@ -76,7 +76,7 @@ public:
     explicit ComboBoxTaskMenuFactory(const QString &iid, QExtensionManager *extensionManager);
 
 private:
-    virtual QComboBox *checkObject(QObject *qObject) const;
+    QComboBox *checkObject(QObject *qObject) const Q_DECL_OVERRIDE;
 };
 
 }  // namespace qdesigner_internal
diff --git a/src/designer/src/components/taskmenu/containerwidget_taskmenu.h b/src/designer/src/components/taskmenu/containerwidget_taskmenu.h
index 02ee7d3..bbbc813 100644
--- a/src/designer/src/components/taskmenu/containerwidget_taskmenu.h
+++ b/src/designer/src/components/taskmenu/containerwidget_taskmenu.h
@@ -64,8 +64,8 @@ public:
     explicit ContainerWidgetTaskMenu(QWidget *widget, ContainerType type, QObject *parent = 0);
     virtual ~ContainerWidgetTaskMenu();
 
-    virtual QAction *preferredEditAction() const;
-    virtual QList<QAction*> taskActions() const;
+    QAction *preferredEditAction() const Q_DECL_OVERRIDE;
+    QList<QAction*> taskActions() const Q_DECL_OVERRIDE;
 
 private slots:
     void removeCurrentPage();
@@ -104,7 +104,7 @@ class WizardContainerWidgetTaskMenu : public ContainerWidgetTaskMenu {
 public:
     explicit WizardContainerWidgetTaskMenu(QWizard *w, QObject *parent = 0);
 
-    virtual QList<QAction*> taskActions() const;
+    QList<QAction*> taskActions() const Q_DECL_OVERRIDE;
 
 private:
     QAction *m_nextAction;
@@ -119,7 +119,7 @@ class MdiContainerWidgetTaskMenu : public ContainerWidgetTaskMenu {
 public:
     explicit MdiContainerWidgetTaskMenu(QMdiArea *m, QObject *parent = 0);
 
-    virtual QList<QAction*> taskActions() const;
+    QList<QAction*> taskActions() const Q_DECL_OVERRIDE;
 private:
     void initializeActions();
 
@@ -136,7 +136,7 @@ public:
     explicit ContainerWidgetTaskMenuFactory(QDesignerFormEditorInterface *core, QExtensionManager *extensionManager = 0);
 
 protected:
-    virtual QObject *createExtension(QObject *object, const QString &iid, QObject *parent) const;
+    QObject *createExtension(QObject *object, const QString &iid, QObject *parent) const Q_DECL_OVERRIDE;
 
 private:
     QDesignerFormEditorInterface *m_core;
diff --git a/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp b/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp
index 57856ec..43f3eee 100644
--- a/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp
@@ -51,7 +51,7 @@ public:
     GroupBoxTaskMenuInlineEditor(QGroupBox *button, QObject *parent);
 
 protected:
-    virtual QRect editRectangle() const;
+    QRect editRectangle() const Q_DECL_OVERRIDE;
 };
 
 GroupBoxTaskMenuInlineEditor::GroupBoxTaskMenuInlineEditor(QGroupBox *w, QObject *parent) :
diff --git a/src/designer/src/components/taskmenu/groupbox_taskmenu.h b/src/designer/src/components/taskmenu/groupbox_taskmenu.h
index 861e4a0..2101549 100644
--- a/src/designer/src/components/taskmenu/groupbox_taskmenu.h
+++ b/src/designer/src/components/taskmenu/groupbox_taskmenu.h
@@ -53,8 +53,8 @@ class GroupBoxTaskMenu: public QDesignerTaskMenu
 public:
     explicit GroupBoxTaskMenu(QGroupBox *groupbox, QObject *parent = 0);
 
-    virtual QAction *preferredEditAction() const;
-    virtual QList<QAction*> taskActions() const;
+    QAction *preferredEditAction() const Q_DECL_OVERRIDE;
+    QList<QAction*> taskActions() const Q_DECL_OVERRIDE;
 
 private:
     QAction *m_editTitleAction;
diff --git a/src/designer/src/components/taskmenu/inplace_widget_helper.h b/src/designer/src/components/taskmenu/inplace_widget_helper.h
index c2b6382..a34ca46 100644
--- a/src/designer/src/components/taskmenu/inplace_widget_helper.h
+++ b/src/designer/src/components/taskmenu/inplace_widget_helper.h
@@ -62,7 +62,7 @@ namespace qdesigner_internal {
         InPlaceWidgetHelper(QWidget *editorWidget, QWidget *parentWidget, QDesignerFormWindowInterface *fw);
         virtual ~InPlaceWidgetHelper();
 
-        virtual bool eventFilter(QObject *object, QEvent *event);
+        bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE;
 
         // returns a recommended alignment for the editor widget determined from the parent.
         Qt::Alignment alignment() const;
diff --git a/src/designer/src/components/taskmenu/itemlisteditor.h b/src/designer/src/components/taskmenu/itemlisteditor.h
index da8fa31..73f3f23 100644
--- a/src/designer/src/components/taskmenu/itemlisteditor.h
+++ b/src/designer/src/components/taskmenu/itemlisteditor.h
@@ -139,8 +139,8 @@ private slots:
     void cacheReloaded();
 
 protected:
-    virtual void setItemData(int role, const QVariant &v);
-    virtual QVariant getItemData(int role) const;
+    void setItemData(int role, const QVariant &v) Q_DECL_OVERRIDE;
+    QVariant getItemData(int role) const Q_DECL_OVERRIDE;
 
 private:
     void setPropertyBrowserVisible(bool v);
diff --git a/src/designer/src/components/taskmenu/label_taskmenu.cpp b/src/designer/src/components/taskmenu/label_taskmenu.cpp
index 3f26e3f..ed50fed 100644
--- a/src/designer/src/components/taskmenu/label_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/label_taskmenu.cpp
@@ -54,7 +54,7 @@ public:
     LabelTaskMenuInlineEditor(QLabel *button, QObject *parent);
 
 protected:
-    virtual QRect editRectangle() const;
+    QRect editRectangle() const Q_DECL_OVERRIDE;
 };
 
 LabelTaskMenuInlineEditor::LabelTaskMenuInlineEditor(QLabel *w, QObject *parent) :
diff --git a/src/designer/src/components/taskmenu/label_taskmenu.h b/src/designer/src/components/taskmenu/label_taskmenu.h
index ecaefcc..2e89835 100644
--- a/src/designer/src/components/taskmenu/label_taskmenu.h
+++ b/src/designer/src/components/taskmenu/label_taskmenu.h
@@ -52,8 +52,8 @@ class LabelTaskMenu: public QDesignerTaskMenu
 public:
     explicit LabelTaskMenu(QLabel *button, QObject *parent = 0);
 
-    virtual QAction *preferredEditAction() const;
-    virtual QList<QAction*> taskActions() const;
+    QAction *preferredEditAction() const Q_DECL_OVERRIDE;
+    QList<QAction*> taskActions() const Q_DECL_OVERRIDE;
 
 private slots:
     void editRichText();
diff --git a/src/designer/src/components/taskmenu/layouttaskmenu.h b/src/designer/src/components/taskmenu/layouttaskmenu.h
index 1c49e78..e350689 100644
--- a/src/designer/src/components/taskmenu/layouttaskmenu.h
+++ b/src/designer/src/components/taskmenu/layouttaskmenu.h
@@ -55,8 +55,8 @@ class LayoutWidgetTaskMenu : public QObject, public QDesignerTaskMenuExtension
 public:
     explicit LayoutWidgetTaskMenu(QLayoutWidget *w, QObject *parent = 0);
 
-    virtual QAction *preferredEditAction() const;
-    virtual QList<QAction*> taskActions() const;
+    QAction *preferredEditAction() const Q_DECL_OVERRIDE;
+    QList<QAction*> taskActions() const Q_DECL_OVERRIDE;
 
 private:
     QLayoutWidget *m_widget;
@@ -72,8 +72,8 @@ class SpacerTaskMenu : public QObject, public QDesignerTaskMenuExtension
 public:
     explicit SpacerTaskMenu(Spacer *bar, QObject *parent = 0);
 
-    virtual QAction *preferredEditAction() const;
-    virtual QList<QAction*> taskActions() const;
+    QAction *preferredEditAction() const Q_DECL_OVERRIDE;
+    QList<QAction*> taskActions() const Q_DECL_OVERRIDE;
 
 };
 
diff --git a/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp b/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp
index c107ea4..d8403e3 100644
--- a/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp
@@ -51,7 +51,7 @@ public:
     LineEditTaskMenuInlineEditor(QLineEdit *button, QObject *parent);
 
 protected:
-    virtual QRect editRectangle() const;
+    QRect editRectangle() const Q_DECL_OVERRIDE;
 };
 
 LineEditTaskMenuInlineEditor::LineEditTaskMenuInlineEditor(QLineEdit *w, QObject *parent) :
diff --git a/src/designer/src/components/taskmenu/lineedit_taskmenu.h b/src/designer/src/components/taskmenu/lineedit_taskmenu.h
index 65dac06..a9b36c3 100644
--- a/src/designer/src/components/taskmenu/lineedit_taskmenu.h
+++ b/src/designer/src/components/taskmenu/lineedit_taskmenu.h
@@ -50,8 +50,8 @@ class LineEditTaskMenu: public QDesignerTaskMenu
 public:
     explicit LineEditTaskMenu(QLineEdit *button, QObject *parent = 0);
 
-    virtual QAction *preferredEditAction() const;
-    virtual QList<QAction*> taskActions() const;
+    QAction *preferredEditAction() const Q_DECL_OVERRIDE;
+    QList<QAction*> taskActions() const Q_DECL_OVERRIDE;
 
 private:
     QList<QAction*> m_taskActions;
diff --git a/src/designer/src/components/taskmenu/listwidget_taskmenu.h b/src/designer/src/components/taskmenu/listwidget_taskmenu.h
index b3e4825..676ae83 100644
--- a/src/designer/src/components/taskmenu/listwidget_taskmenu.h
+++ b/src/designer/src/components/taskmenu/listwidget_taskmenu.h
@@ -54,8 +54,8 @@ public:
     explicit ListWidgetTaskMenu(QListWidget *button, QObject *parent = 0);
     virtual ~ListWidgetTaskMenu();
 
-    virtual QAction *preferredEditAction() const;
-    virtual QList<QAction*> taskActions() const;
+    QAction *preferredEditAction() const Q_DECL_OVERRIDE;
+    QList<QAction*> taskActions() const Q_DECL_OVERRIDE;
 
 private slots:
     void editItems();
diff --git a/src/designer/src/components/taskmenu/menutaskmenu.h b/src/designer/src/components/taskmenu/menutaskmenu.h
index 4fe52f7..3be58c6 100644
--- a/src/designer/src/components/taskmenu/menutaskmenu.h
+++ b/src/designer/src/components/taskmenu/menutaskmenu.h
@@ -59,8 +59,8 @@ class MenuTaskMenu : public QObject, public QDesignerTaskMenuExtension
 public:
     explicit MenuTaskMenu(QDesignerMenu *menu, QObject *parent = 0);
 
-    virtual QAction *preferredEditAction() const;
-    virtual QList<QAction*> taskActions() const;
+    QAction *preferredEditAction() const Q_DECL_OVERRIDE;
+    QList<QAction*> taskActions() const Q_DECL_OVERRIDE;
 
 private slots:
     void removeMenu();
@@ -81,8 +81,8 @@ class MenuBarTaskMenu : public QObject, public QDesignerTaskMenuExtension
 public:
     explicit MenuBarTaskMenu(QDesignerMenuBar *bar, QObject *parent = 0);
 
-    virtual QAction *preferredEditAction() const;
-    virtual QList<QAction*> taskActions() const;
+    QAction *preferredEditAction() const Q_DECL_OVERRIDE;
+    QList<QAction*> taskActions() const Q_DECL_OVERRIDE;
 
 private:
     QDesignerMenuBar *m_bar;
diff --git a/src/designer/src/components/taskmenu/tablewidget_taskmenu.h b/src/designer/src/components/taskmenu/tablewidget_taskmenu.h
index a3fa550..ebff75f 100644
--- a/src/designer/src/components/taskmenu/tablewidget_taskmenu.h
+++ b/src/designer/src/components/taskmenu/tablewidget_taskmenu.h
@@ -54,8 +54,8 @@ public:
     explicit TableWidgetTaskMenu(QTableWidget *button, QObject *parent = 0);
     virtual ~TableWidgetTaskMenu();
 
-    virtual QAction *preferredEditAction() const;
-    virtual QList<QAction*> taskActions() const;
+    QAction *preferredEditAction() const Q_DECL_OVERRIDE;
+    QList<QAction*> taskActions() const Q_DECL_OVERRIDE;
 
 private slots:
     void editItems();
diff --git a/src/designer/src/components/taskmenu/tablewidgeteditor.h b/src/designer/src/components/taskmenu/tablewidgeteditor.h
index cfc27d7..55ce37a 100644
--- a/src/designer/src/components/taskmenu/tablewidgeteditor.h
+++ b/src/designer/src/components/taskmenu/tablewidgeteditor.h
@@ -85,8 +85,8 @@ private slots:
     void cacheReloaded();
 
 protected:
-    virtual void setItemData(int role, const QVariant &v);
-    virtual QVariant getItemData(int role) const;
+    void setItemData(int role, const QVariant &v) Q_DECL_OVERRIDE;
+    QVariant getItemData(int role) const Q_DECL_OVERRIDE;
 
 private:
     void setPropertyBrowserVisible(bool v);
diff --git a/src/designer/src/components/taskmenu/textedit_taskmenu.h b/src/designer/src/components/taskmenu/textedit_taskmenu.h
index 3012e8e..a18a6c0 100644
--- a/src/designer/src/components/taskmenu/textedit_taskmenu.h
+++ b/src/designer/src/components/taskmenu/textedit_taskmenu.h
@@ -55,8 +55,8 @@ public:
 
     virtual ~TextEditTaskMenu();
 
-    virtual QAction *preferredEditAction() const;
-    virtual QList<QAction*> taskActions() const;
+    QAction *preferredEditAction() const Q_DECL_OVERRIDE;
+    QList<QAction*> taskActions() const Q_DECL_OVERRIDE;
 
 private slots:
     void editText();
diff --git a/src/designer/src/components/taskmenu/toolbar_taskmenu.h b/src/designer/src/components/taskmenu/toolbar_taskmenu.h
index 42eb035..7ed9c2d 100644
--- a/src/designer/src/components/taskmenu/toolbar_taskmenu.h
+++ b/src/designer/src/components/taskmenu/toolbar_taskmenu.h
@@ -54,8 +54,8 @@ class ToolBarTaskMenu : public QObject, public QDesignerTaskMenuExtension
 public:
     explicit ToolBarTaskMenu(QToolBar *tb, QObject *parent = 0);
 
-    virtual QAction *preferredEditAction() const;
-    virtual QList<QAction*> taskActions() const;
+    QAction *preferredEditAction() const Q_DECL_OVERRIDE;
+    QList<QAction*> taskActions() const Q_DECL_OVERRIDE;
 
 private:
     QToolBar *m_toolBar;
@@ -69,8 +69,8 @@ class StatusBarTaskMenu : public QObject, public QDesignerTaskMenuExtension
 public:
     explicit StatusBarTaskMenu(QStatusBar *tb, QObject *parent = 0);
 
-    virtual QAction *preferredEditAction() const;
-    virtual QList<QAction*> taskActions() const;
+    QAction *preferredEditAction() const Q_DECL_OVERRIDE;
+    QList<QAction*> taskActions() const Q_DECL_OVERRIDE;
 
 private slots:
     void removeStatusBar();
diff --git a/src/designer/src/components/taskmenu/treewidget_taskmenu.h b/src/designer/src/components/taskmenu/treewidget_taskmenu.h
index 4919cb2..73eb127 100644
--- a/src/designer/src/components/taskmenu/treewidget_taskmenu.h
+++ b/src/designer/src/components/taskmenu/treewidget_taskmenu.h
@@ -54,8 +54,8 @@ public:
     explicit TreeWidgetTaskMenu(QTreeWidget *button, QObject *parent = 0);
     virtual ~TreeWidgetTaskMenu();
 
-    virtual QAction *preferredEditAction() const;
-    virtual QList<QAction*> taskActions() const;
+    QAction *preferredEditAction() const Q_DECL_OVERRIDE;
+    QList<QAction*> taskActions() const Q_DECL_OVERRIDE;
 
 private slots:
     void editItems();
diff --git a/src/designer/src/components/taskmenu/treewidgeteditor.h b/src/designer/src/components/taskmenu/treewidgeteditor.h
index 6d4709e..e18a62d 100644
--- a/src/designer/src/components/taskmenu/treewidgeteditor.h
+++ b/src/designer/src/components/taskmenu/treewidgeteditor.h
@@ -83,8 +83,8 @@ private slots:
     void cacheReloaded();
 
 protected:
-    virtual void setItemData(int role, const QVariant &v);
-    virtual QVariant getItemData(int role) const;
+    void setItemData(int role, const QVariant &v) Q_DECL_OVERRIDE;
+    QVariant getItemData(int role) const Q_DECL_OVERRIDE;
 
 private:
     void setPropertyBrowserVisible(bool v);
diff --git a/src/designer/src/components/widgetbox/widgetbox.cpp b/src/designer/src/components/widgetbox/widgetbox.cpp
index 034b085..5ed22b7 100644
--- a/src/designer/src/components/widgetbox/widgetbox.cpp
+++ b/src/designer/src/components/widgetbox/widgetbox.cpp
@@ -64,8 +64,8 @@ public:
         { setFocusPolicy(Qt::NoFocus); }
 
 protected:
-    virtual void mousePressEvent(QMouseEvent *event);
-    virtual void focusInEvent(QFocusEvent *e);
+    void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
+    void focusInEvent(QFocusEvent *e) Q_DECL_OVERRIDE;
 
 private:
     const Qt::FocusPolicy m_defaultFocusPolicy;
diff --git a/src/designer/src/components/widgetbox/widgetbox.h b/src/designer/src/components/widgetbox/widgetbox.h
index 1ec9cec..49f028d 100644
--- a/src/designer/src/components/widgetbox/widgetbox.h
+++ b/src/designer/src/components/widgetbox/widgetbox.h
@@ -55,30 +55,30 @@ public:
 
     QDesignerFormEditorInterface *core() const;
 
-    virtual int categoryCount() const;
-    virtual Category category(int cat_idx) const;
-    virtual void addCategory(const Category &cat);
-    virtual void removeCategory(int cat_idx);
+    int categoryCount() const Q_DECL_OVERRIDE;
+    Category category(int cat_idx) const Q_DECL_OVERRIDE;
+    void addCategory(const Category &cat) Q_DECL_OVERRIDE;
+    void removeCategory(int cat_idx) Q_DECL_OVERRIDE;
 
-    virtual int widgetCount(int cat_idx) const;
-    virtual Widget widget(int cat_idx, int wgt_idx) const;
-    virtual void addWidget(int cat_idx, const Widget &wgt);
-    virtual void removeWidget(int cat_idx, int wgt_idx);
+    int widgetCount(int cat_idx) const Q_DECL_OVERRIDE;
+    Widget widget(int cat_idx, int wgt_idx) const Q_DECL_OVERRIDE;
+    void addWidget(int cat_idx, const Widget &wgt) Q_DECL_OVERRIDE;
+    void removeWidget(int cat_idx, int wgt_idx) Q_DECL_OVERRIDE;
 
     void dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, const QPoint &global_mouse_pos);
 
-    virtual void setFileName(const QString &file_name);
-    virtual QString fileName() const;
+    void setFileName(const QString &file_name) Q_DECL_OVERRIDE;
+    QString fileName() const Q_DECL_OVERRIDE;
     virtual bool load();
     virtual bool save();
 
-    virtual bool loadContents(const QString &contents);
-    virtual QIcon iconForWidget(const QString &className, const QString &category = QString()) const;
+    bool loadContents(const QString &contents) Q_DECL_OVERRIDE;
+    QIcon iconForWidget(const QString &className, const QString &category = QString()) const Q_DECL_OVERRIDE;
 
 protected:
-    virtual void dragEnterEvent (QDragEnterEvent * event);
-    virtual void dragMoveEvent(QDragMoveEvent * event);
-    virtual void dropEvent (QDropEvent * event);
+    void dragEnterEvent (QDragEnterEvent * event) Q_DECL_OVERRIDE;
+    void dragMoveEvent(QDragMoveEvent * event) Q_DECL_OVERRIDE;
+    void dropEvent (QDropEvent * event) Q_DECL_OVERRIDE;
 
 private slots:
     void handleMousePress(const QString &name, const QString &xml, const QPoint &global_mouse_pos);
diff --git a/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp b/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp
index 70b2127..8cc99c8 100644
--- a/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp
+++ b/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp
@@ -75,9 +75,9 @@ public:
 
 protected:
 
-    virtual QWidget *create(DomWidget *ui_widget, QWidget *parents);
-    virtual QWidget *createWidget(const QString &widgetName, QWidget *parentWidget, const QString &name);
-    virtual void createCustomWidgets(DomCustomWidgets *);
+    QWidget *create(DomWidget *ui_widget, QWidget *parents) Q_DECL_OVERRIDE;
+    QWidget *createWidget(const QString &widgetName, QWidget *parentWidget, const QString &name) Q_DECL_OVERRIDE;
+    void createCustomWidgets(DomCustomWidgets *) Q_DECL_OVERRIDE;
 };
 
 WidgetBoxResource::WidgetBoxResource(QDesignerFormEditorInterface *core) :
diff --git a/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp
index cc0f62b..db04cfb 100644
--- a/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp
+++ b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp
@@ -118,11 +118,11 @@ public:
     explicit WidgetBoxCategoryModel(QDesignerFormEditorInterface *core, QObject *parent = 0);
 
     // QAbstractListModel
-    virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-    virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    virtual bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole);
-    virtual Qt::ItemFlags flags (const QModelIndex & index ) const;
-    virtual bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
+    bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole) Q_DECL_OVERRIDE;
+    Qt::ItemFlags flags (const QModelIndex & index ) const Q_DECL_OVERRIDE;
+    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE;
 
     // The model returns no text in icon mode, so, it also needs to know it
     QListView::ViewMode viewMode() const;
diff --git a/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp b/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp
index 116bb40..d2ba91d 100644
--- a/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp
+++ b/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp
@@ -236,7 +236,7 @@ class MyCustomWidgets: public QObject, public QDesignerCustomWidgetCollectionInt
 public:
     MyCustomWidgets(QObject *parent = 0);
 
-    virtual QList<QDesignerCustomWidgetInterface*> customWidgets() const;
+    QList<QDesignerCustomWidgetInterface*> customWidgets() const Q_DECL_OVERRIDE;
 
 private:
     QList<QDesignerCustomWidgetInterface*> widgets;
diff --git a/src/designer/src/designer/mainwindow.h b/src/designer/src/designer/mainwindow.h
index 8bdbffe..400a519 100644
--- a/src/designer/src/designer/mainwindow.h
+++ b/src/designer/src/designer/mainwindow.h
@@ -85,7 +85,7 @@ signals:
     void closeEventReceived(QCloseEvent *e);
 
 protected:
-    virtual void closeEvent(QCloseEvent *e);
+    void closeEvent(QCloseEvent *e) Q_DECL_OVERRIDE;
 private:
     CloseEventPolicy m_policy;
 };
diff --git a/src/designer/src/designer/qdesigner_formwindow.h b/src/designer/src/designer/qdesigner_formwindow.h
index 9965d49..35a1526 100644
--- a/src/designer/src/designer/qdesigner_formwindow.h
+++ b/src/designer/src/designer/qdesigner_formwindow.h
@@ -71,9 +71,9 @@ signals:
     void triggerAction();
 
 protected:
-    virtual void changeEvent(QEvent *e);
-    virtual void closeEvent(QCloseEvent *ev);
-    virtual void resizeEvent(QResizeEvent* rev);
+    void changeEvent(QEvent *e) Q_DECL_OVERRIDE;
+    void closeEvent(QCloseEvent *ev) Q_DECL_OVERRIDE;
+    void resizeEvent(QResizeEvent* rev) Q_DECL_OVERRIDE;
 
 private:
     int getNumberOfUntitledWindows() const;
diff --git a/src/designer/src/designer/qdesigner_toolwindow.cpp b/src/designer/src/designer/qdesigner_toolwindow.cpp
index 285de08..601ce71 100644
--- a/src/designer/src/designer/qdesigner_toolwindow.cpp
+++ b/src/designer/src/designer/qdesigner_toolwindow.cpp
@@ -169,10 +169,10 @@ class PropertyEditorToolWindow : public QDesignerToolWindow
 public:
     explicit PropertyEditorToolWindow(QDesignerWorkbench *workbench);
 
-    virtual QRect geometryHint() const;
+    QRect geometryHint() const Q_DECL_OVERRIDE;
 
 protected:
-    virtual void showEvent(QShowEvent *event);
+    void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
 };
 
 PropertyEditorToolWindow::PropertyEditorToolWindow(QDesignerWorkbench *workbench) :
@@ -226,7 +226,7 @@ class ActionEditorToolWindow: public QDesignerToolWindow
 public:
     explicit ActionEditorToolWindow(QDesignerWorkbench *workbench);
 
-    virtual QRect geometryHint() const;
+    QRect geometryHint() const Q_DECL_OVERRIDE;
 };
 
 ActionEditorToolWindow::ActionEditorToolWindow(QDesignerWorkbench *workbench) :
@@ -268,7 +268,7 @@ class ObjectInspectorToolWindow: public QDesignerToolWindow
 public:
     explicit ObjectInspectorToolWindow(QDesignerWorkbench *workbench);
 
-    virtual QRect geometryHint() const;
+    QRect geometryHint() const Q_DECL_OVERRIDE;
 };
 
 ObjectInspectorToolWindow::ObjectInspectorToolWindow(QDesignerWorkbench *workbench) :
@@ -303,7 +303,7 @@ class ResourceEditorToolWindow: public QDesignerToolWindow
 public:
     explicit ResourceEditorToolWindow(QDesignerWorkbench *workbench);
 
-    virtual QRect geometryHint() const;
+    QRect geometryHint() const Q_DECL_OVERRIDE;
 };
 
 ResourceEditorToolWindow::ResourceEditorToolWindow(QDesignerWorkbench *workbench)  :
@@ -337,7 +337,7 @@ class SignalSlotEditorToolWindow: public QDesignerToolWindow
 public:
     explicit SignalSlotEditorToolWindow(QDesignerWorkbench *workbench);
 
-    virtual QRect geometryHint() const;
+    QRect geometryHint() const Q_DECL_OVERRIDE;
 };
 
 SignalSlotEditorToolWindow::SignalSlotEditorToolWindow(QDesignerWorkbench *workbench) :
@@ -378,7 +378,7 @@ class WidgetBoxToolWindow: public QDesignerToolWindow
 public:
     explicit WidgetBoxToolWindow(QDesignerWorkbench *workbench);
 
-    virtual QRect geometryHint() const;
+    QRect geometryHint() const Q_DECL_OVERRIDE;
 };
 
 WidgetBoxToolWindow::WidgetBoxToolWindow(QDesignerWorkbench *workbench) :
diff --git a/src/designer/src/designer/qdesigner_toolwindow.h b/src/designer/src/designer/qdesigner_toolwindow.h
index ec09818..319b6fa 100644
--- a/src/designer/src/designer/qdesigner_toolwindow.h
+++ b/src/designer/src/designer/qdesigner_toolwindow.h
@@ -98,9 +98,9 @@ private slots:
     void showMe(bool);
 
 protected:
-    virtual void showEvent(QShowEvent *e);
-    virtual void hideEvent(QHideEvent *e);
-    virtual void changeEvent(QEvent *e);
+    void showEvent(QShowEvent *e) Q_DECL_OVERRIDE;
+    void hideEvent(QHideEvent *e) Q_DECL_OVERRIDE;
+    void changeEvent(QEvent *e) Q_DECL_OVERRIDE;
 
     QRect availableToolWindowGeometry() const;
 
diff --git a/src/designer/src/lib/extension/default_extensionfactory.h b/src/designer/src/lib/extension/default_extensionfactory.h
index 1001f82..e43e6b3 100644
--- a/src/designer/src/lib/extension/default_extensionfactory.h
+++ b/src/designer/src/lib/extension/default_extensionfactory.h
@@ -52,7 +52,7 @@ class QDESIGNER_EXTENSION_EXPORT QExtensionFactory : public QObject, public QAbs
 public:
     QExtensionFactory(QExtensionManager *parent = 0);
 
-    virtual QObject *extension(QObject *object, const QString &iid) const;
+    QObject *extension(QObject *object, const QString &iid) const Q_DECL_OVERRIDE;
     QExtensionManager *extensionManager() const;
 
 private Q_SLOTS:
diff --git a/src/designer/src/lib/extension/qextensionmanager.h b/src/designer/src/lib/extension/qextensionmanager.h
index 5a06f62..e0926aa 100644
--- a/src/designer/src/lib/extension/qextensionmanager.h
+++ b/src/designer/src/lib/extension/qextensionmanager.h
@@ -50,10 +50,10 @@ public:
     QExtensionManager(QObject *parent = 0);
     ~QExtensionManager();
 
-    virtual void registerExtensions(QAbstractExtensionFactory *factory, const QString &iid = QString());
-    virtual void unregisterExtensions(QAbstractExtensionFactory *factory, const QString &iid = QString());
+    void registerExtensions(QAbstractExtensionFactory *factory, const QString &iid = QString()) Q_DECL_OVERRIDE;
+    void unregisterExtensions(QAbstractExtensionFactory *factory, const QString &iid = QString()) Q_DECL_OVERRIDE;
 
-    virtual QObject *extension(QObject *object, const QString &iid) const;
+    QObject *extension(QObject *object, const QString &iid) const Q_DECL_OVERRIDE;
 
 private:
     typedef QList<QAbstractExtensionFactory*> FactoryList;
diff --git a/src/designer/src/lib/shared/actioneditor_p.h b/src/designer/src/lib/shared/actioneditor_p.h
index 205539d..e96a185 100644
--- a/src/designer/src/lib/shared/actioneditor_p.h
+++ b/src/designer/src/lib/shared/actioneditor_p.h
@@ -76,17 +76,17 @@ public:
     virtual ~ActionEditor();
 
     QDesignerFormWindowInterface *formWindow() const;
-    virtual void setFormWindow(QDesignerFormWindowInterface *formWindow);
+    void setFormWindow(QDesignerFormWindowInterface *formWindow) Q_DECL_OVERRIDE;
 
-    virtual QDesignerFormEditorInterface *core() const;
+    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
 
     QAction *actionNew() const;
     QAction *actionDelete() const;
 
     QString filter() const;
 
-    virtual void manageAction(QAction *action);
-    virtual void unmanageAction(QAction *action);
+    void manageAction(QAction *action) Q_DECL_OVERRIDE;
+    void unmanageAction(QAction *action) Q_DECL_OVERRIDE;
 
     static QString actionTextToName(const QString &text, const QString &prefix = QLatin1String("action"));
 
diff --git a/src/designer/src/lib/shared/actionrepository_p.h b/src/designer/src/lib/shared/actionrepository_p.h
index 9063710..76a0672 100644
--- a/src/designer/src/lib/shared/actionrepository_p.h
+++ b/src/designer/src/lib/shared/actionrepository_p.h
@@ -88,9 +88,9 @@ public:
     QString actionName(int row) const;
     QAction *actionAt(const QModelIndex &index) const;
 
-    virtual QMimeData *mimeData(const QModelIndexList &indexes) const;
-    virtual QStringList mimeTypes() const;
-    virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent);
+    QMimeData *mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE;
+    QStringList mimeTypes() const Q_DECL_OVERRIDE;
+    bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE;
 
     // Find the associated menus and toolbars, ignore toolbuttons
     static QWidgetList associatedWidgets(const QAction *action);
@@ -132,15 +132,15 @@ signals:
     void activated(QAction *action);
 
 protected slots:
-    virtual void currentChanged(const QModelIndex &current, const QModelIndex &previous);
+    void currentChanged(const QModelIndex &current, const QModelIndex &previous) Q_DECL_OVERRIDE;
 
 protected:
-    virtual void dragEnterEvent(QDragEnterEvent *event);
-    virtual void dragMoveEvent(QDragMoveEvent *event);
-    virtual void dropEvent(QDropEvent *event);
-    virtual void focusInEvent(QFocusEvent *event);
-    virtual void contextMenuEvent(QContextMenuEvent *event);
-    virtual void startDrag(Qt::DropActions supportedActions);
+    void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE;
+    void dragMoveEvent(QDragMoveEvent *event) Q_DECL_OVERRIDE;
+    void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE;
+    void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE;
+    void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE;
+    void startDrag(Qt::DropActions supportedActions) Q_DECL_OVERRIDE;
 
 private slots:
     void slotActivated(const QModelIndex &);
@@ -166,15 +166,15 @@ signals:
     void activated(QAction *action);
 
 protected slots:
-    virtual void currentChanged(const QModelIndex &current, const QModelIndex &previous);
+    void currentChanged(const QModelIndex &current, const QModelIndex &previous) Q_DECL_OVERRIDE;
 
 protected:
-    virtual void dragEnterEvent(QDragEnterEvent *event);
-    virtual void dragMoveEvent(QDragMoveEvent *event);
-    virtual void dropEvent(QDropEvent *event);
-    virtual void focusInEvent(QFocusEvent *event);
-    virtual void contextMenuEvent(QContextMenuEvent *event);
-    virtual void startDrag(Qt::DropActions supportedActions);
+    void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE;
+    void dragMoveEvent(QDragMoveEvent *event) Q_DECL_OVERRIDE;
+    void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE;
+    void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE;
+    void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE;
+    void startDrag(Qt::DropActions supportedActions) Q_DECL_OVERRIDE;
 
 private slots:
     void slotActivated(const QModelIndex &);
@@ -243,7 +243,7 @@ public:
     ActionRepositoryMimeData(QAction *, Qt::DropAction dropAction);
 
     const ActionList &actionList() const { return m_actionList; }
-    virtual QStringList formats() const;
+    QStringList formats() const Q_DECL_OVERRIDE;
 
     static QPixmap actionDragPixmap(const QAction *action);
 
diff --git a/src/designer/src/lib/shared/connectionedit_p.h b/src/designer/src/lib/shared/connectionedit_p.h
index e741b28..8152f7d 100644
--- a/src/designer/src/lib/shared/connectionedit_p.h
+++ b/src/designer/src/lib/shared/connectionedit_p.h
@@ -205,14 +205,14 @@ public slots:
     void enableUpdateBackground(bool enable);
 
 protected:
-    virtual void paintEvent(QPaintEvent *e);
-    virtual void mouseMoveEvent(QMouseEvent *e);
-    virtual void mousePressEvent(QMouseEvent *e);
-    virtual void mouseReleaseEvent(QMouseEvent *e);
-    virtual void keyPressEvent(QKeyEvent *e);
-    virtual void mouseDoubleClickEvent(QMouseEvent *e);
-    virtual void resizeEvent(QResizeEvent *e);
-    virtual void contextMenuEvent(QContextMenuEvent * event);
+    void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE;
+    void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
+    void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
+    void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
+    void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE;
+    void mouseDoubleClickEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
+    void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE;
+    void contextMenuEvent(QContextMenuEvent * event) Q_DECL_OVERRIDE;
 
     virtual Connection *createConnection(QWidget *source, QWidget *target);
     virtual void modifyConnection(Connection *con);
diff --git a/src/designer/src/lib/shared/dialoggui.cpp b/src/designer/src/lib/shared/dialoggui.cpp
index b178b68..dcda33e 100644
--- a/src/designer/src/lib/shared/dialoggui.cpp
+++ b/src/designer/src/lib/shared/dialoggui.cpp
@@ -58,7 +58,7 @@ class IconProvider : public QFileIconProvider {
 
 public:
     IconProvider();
-    virtual QIcon icon (const QFileInfo &info) const;
+    QIcon icon (const QFileInfo &info) const Q_DECL_OVERRIDE;
 
     inline bool loadCheck(const QFileInfo &info) const;
     QImage loadImage(const QString &fileName) const;
diff --git a/src/designer/src/lib/shared/dialoggui_p.h b/src/designer/src/lib/shared/dialoggui_p.h
index 0dab6ae..afa2dc5 100644
--- a/src/designer/src/lib/shared/dialoggui_p.h
+++ b/src/designer/src/lib/shared/dialoggui_p.h
@@ -77,13 +77,13 @@ public:
                 QMessageBox::StandardButtons buttons = QMessageBox::Ok,
                 QMessageBox::StandardButton defaultButton = QMessageBox::NoButton);
 
-    virtual QString getExistingDirectory(QWidget *parent = 0, const QString &caption = QString(), const QString &dir = QString(), QFileDialog::Options options = QFileDialog::ShowDirsOnly);
-    virtual QString getOpenFileName(QWidget *parent = 0, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0);
-    virtual QStringList getOpenFileNames(QWidget *parent = 0, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0);
-    virtual QString getSaveFileName(QWidget *parent = 0, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0);
+    QString getExistingDirectory(QWidget *parent = 0, const QString &caption = QString(), const QString &dir = QString(), QFileDialog::Options options = QFileDialog::ShowDirsOnly) Q_DECL_OVERRIDE;
+    QString getOpenFileName(QWidget *parent = 0, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0) Q_DECL_OVERRIDE;
+    QStringList getOpenFileNames(QWidget *parent = 0, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0) Q_DECL_OVERRIDE;
+    QString getSaveFileName(QWidget *parent = 0, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0) Q_DECL_OVERRIDE;
 
-    virtual QString getOpenImageFileName(QWidget *parent = 0, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0);
-    virtual QStringList getOpenImageFileNames(QWidget *parent = 0, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0);
+    QString getOpenImageFileName(QWidget *parent = 0, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0) Q_DECL_OVERRIDE;
+    QStringList getOpenImageFileNames(QWidget *parent = 0, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0) Q_DECL_OVERRIDE;
 
 private:
     QFileIconProvider *ensureIconProvider();
diff --git a/src/designer/src/lib/shared/extensionfactory_p.h b/src/designer/src/lib/shared/extensionfactory_p.h
index 2a0080f..4a01fb7 100644
--- a/src/designer/src/lib/shared/extensionfactory_p.h
+++ b/src/designer/src/lib/shared/extensionfactory_p.h
@@ -63,7 +63,7 @@ public:
     static void registerExtension(QExtensionManager *mgr, const QString &iid);
 
 protected:
-    virtual QObject *createExtension(QObject *qObject, const QString &iid, QObject *parent) const;
+    QObject *createExtension(QObject *qObject, const QString &iid, QObject *parent) const Q_DECL_OVERRIDE;
 
 private:
     // Can be overwritten to perform checks on the object.
diff --git a/src/designer/src/lib/shared/formwindowbase_p.h b/src/designer/src/lib/shared/formwindowbase_p.h
index 4635ca3..e511eaf 100644
--- a/src/designer/src/lib/shared/formwindowbase_p.h
+++ b/src/designer/src/lib/shared/formwindowbase_p.h
@@ -81,17 +81,17 @@ public:
     QVariantMap formData();
     void setFormData(const QVariantMap &vm);
 
-    virtual QStringList checkContents() const;
+    QStringList checkContents() const Q_DECL_OVERRIDE;
 
     // Deprecated
-    virtual QPoint grid() const;
+    QPoint grid() const Q_DECL_OVERRIDE;
 
     // Deprecated
-    virtual void setGrid(const QPoint &grid);
+    void setGrid(const QPoint &grid) Q_DECL_OVERRIDE;
 
-    virtual bool hasFeature(Feature f) const;
-    virtual Feature features() const;
-    virtual void setFeatures(Feature f);
+    bool hasFeature(Feature f) const Q_DECL_OVERRIDE;
+    Feature features() const Q_DECL_OVERRIDE;
+    void setFeatures(Feature f) Q_DECL_OVERRIDE;
 
     const Grid &designerGrid() const;
     void setDesignerGrid(const  Grid& grid);
@@ -101,8 +101,8 @@ public:
 
     bool gridVisible() const;
 
-    virtual ResourceFileSaveMode resourceFileSaveMode() const;
-    virtual void setResourceFileSaveMode(ResourceFileSaveMode behaviour);
+    ResourceFileSaveMode resourceFileSaveMode() const Q_DECL_OVERRIDE;
+    void setResourceFileSaveMode(ResourceFileSaveMode behavior) Q_DECL_OVERRIDE;
 
     static const Grid &defaultDesignerGrid();
     static void setDefaultDesignerGrid(const Grid& grid);
@@ -139,8 +139,8 @@ public:
 
     DesignerPixmapCache *pixmapCache() const;
     DesignerIconCache *iconCache() const;
-    virtual QtResourceSet *resourceSet() const;
-    virtual void setResourceSet(QtResourceSet *resourceSet);
+    QtResourceSet *resourceSet() const Q_DECL_OVERRIDE;
+    void setResourceSet(QtResourceSet *resourceSet) Q_DECL_OVERRIDE;
     void addReloadableProperty(QDesignerPropertySheet *sheet, int index);
     void removeReloadableProperty(QDesignerPropertySheet *sheet, int index);
     void addReloadablePropertySheet(QDesignerPropertySheet *sheet, QObject *object);
diff --git a/src/designer/src/lib/shared/metadatabase_p.h b/src/designer/src/lib/shared/metadatabase_p.h
index 82797cb..007b500 100644
--- a/src/designer/src/lib/shared/metadatabase_p.h
+++ b/src/designer/src/lib/shared/metadatabase_p.h
@@ -63,15 +63,15 @@ public:
     explicit MetaDataBaseItem(QObject *object);
     virtual ~MetaDataBaseItem();
 
-    virtual QString name() const;
-    virtual void setName(const QString &name);
+    QString name() const Q_DECL_OVERRIDE;
+    void setName(const QString &name) Q_DECL_OVERRIDE;
 
     typedef QList<QWidget*> TabOrder;
-    virtual TabOrder tabOrder() const;
-    virtual void setTabOrder(const TabOrder &tabOrder);
+    TabOrder tabOrder() const Q_DECL_OVERRIDE;
+    void setTabOrder(const TabOrder &tabOrder) Q_DECL_OVERRIDE;
 
-    virtual bool enabled() const;
-    virtual void setEnabled(bool b);
+    bool enabled() const Q_DECL_OVERRIDE;
+    void setEnabled(bool b) Q_DECL_OVERRIDE;
 
     QString customClassName() const;
     void setCustomClassName(const QString &customClassName);
@@ -98,14 +98,14 @@ public:
     explicit MetaDataBase(QDesignerFormEditorInterface *core, QObject *parent = 0);
     virtual ~MetaDataBase();
 
-    virtual QDesignerFormEditorInterface *core() const;
+    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
 
     virtual QDesignerMetaDataBaseItemInterface *item(QObject *object) const { return metaDataBaseItem(object); }
     virtual MetaDataBaseItem *metaDataBaseItem(QObject *object) const;
-    virtual void add(QObject *object);
-    virtual void remove(QObject *object);
+    void add(QObject *object) Q_DECL_OVERRIDE;
+    void remove(QObject *object) Q_DECL_OVERRIDE;
 
-    virtual QList<QObject*> objects() const;
+    QList<QObject*> objects() const Q_DECL_OVERRIDE;
 
 private slots:
     void slotDestroyed(QObject *object);
diff --git a/src/designer/src/lib/shared/newformwidget_p.h b/src/designer/src/lib/shared/newformwidget_p.h
index 568280a..261d996 100644
--- a/src/designer/src/lib/shared/newformwidget_p.h
+++ b/src/designer/src/lib/shared/newformwidget_p.h
@@ -81,8 +81,8 @@ public:
     explicit NewFormWidget(QDesignerFormEditorInterface *core, QWidget *parentWidget);
     virtual ~NewFormWidget();
 
-    virtual bool hasCurrentTemplate() const;
-    virtual QString currentTemplate(QString *errorMessage = 0);
+    bool hasCurrentTemplate() const Q_DECL_OVERRIDE;
+    QString currentTemplate(QString *errorMessage = 0) Q_DECL_OVERRIDE;
 
     // Convenience for implementing file dialogs with preview
     static QImage grabForm(QDesignerFormEditorInterface *core,
diff --git a/src/designer/src/lib/shared/previewmanager.cpp b/src/designer/src/lib/shared/previewmanager.cpp
index 87152ca..71a1f72 100644
--- a/src/designer/src/lib/shared/previewmanager.cpp
+++ b/src/designer/src/lib/shared/previewmanager.cpp
@@ -108,7 +108,7 @@ class DesignerZoomProxyWidget : public ZoomProxyWidget  {
 public:
     DesignerZoomProxyWidget(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
 protected:
-    virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint = QSizeF() ) const;
+    QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint = QSizeF() ) const Q_DECL_OVERRIDE;
 };
 
 DesignerZoomProxyWidget::DesignerZoomProxyWidget(QGraphicsItem *parent, Qt::WindowFlags wFlags) :
@@ -129,7 +129,7 @@ class DesignerZoomWidget : public ZoomWidget {
 public:
     DesignerZoomWidget(QWidget *parent = 0);
 private:
-    virtual QGraphicsProxyWidget *createProxyWidget(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0) const;
+    QGraphicsProxyWidget *createProxyWidget(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0) const Q_DECL_OVERRIDE;
 };
 
 DesignerZoomWidget::DesignerZoomWidget(QWidget *parent) :
@@ -333,7 +333,7 @@ class ZoomablePreviewDeviceSkin : public PreviewDeviceSkin
     Q_OBJECT
 public:
     explicit ZoomablePreviewDeviceSkin(const DeviceSkinParameters &parameters, QWidget *parent);
-    virtual void setPreview(QWidget *w);
+    void setPreview(QWidget *w) Q_DECL_OVERRIDE;
 
     int zoomPercent() const; // Device Skins have a double 'zoom' property
 
@@ -344,9 +344,9 @@ signals:
     void zoomPercentChanged(int);
 
 protected:
-    virtual void populateContextMenu(QMenu *m);
-    virtual QMatrix skinTransform() const;
-    virtual void fitWidget(const QSize &size);
+    void populateContextMenu(QMenu *m) Q_DECL_OVERRIDE;
+    QMatrix skinTransform() const Q_DECL_OVERRIDE;
+    void fitWidget(const QSize &size) Q_DECL_OVERRIDE;
 
 private:
     ZoomMenu *m_zoomMenu;
diff --git a/src/designer/src/lib/shared/previewmanager_p.h b/src/designer/src/lib/shared/previewmanager_p.h
index 12cb5ee..e0a4037 100644
--- a/src/designer/src/lib/shared/previewmanager_p.h
+++ b/src/designer/src/lib/shared/previewmanager_p.h
@@ -137,7 +137,7 @@ public:
     QPixmap createPreviewPixmap(const QDesignerFormWindowInterface *fw, const QString &style, int deviceProfileIndex /*=-1*/, QString *errorMessage);
     QPixmap createPreviewPixmap(const QDesignerFormWindowInterface *fw, const QString &style, QString *errorMessage);
 
-    virtual bool eventFilter(QObject *watched, QEvent *event);
+    bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE;
 
 public slots:
     void closeAllPreviews();
diff --git a/src/designer/src/lib/shared/qdesigner_command_p.h b/src/designer/src/lib/shared/qdesigner_command_p.h
index e11e009..aa412be 100644
--- a/src/designer/src/lib/shared/qdesigner_command_p.h
+++ b/src/designer/src/lib/shared/qdesigner_command_p.h
@@ -144,8 +144,8 @@ public:
     void init(QWidget *widget);
 
 protected:
-    virtual QWidgetList reorderWidget(const QWidgetList &list, QWidget *widget) const;
-    virtual void reorder(QWidget *widget) const;
+    QWidgetList reorderWidget(const QWidgetList &list, QWidget *widget) const Q_DECL_OVERRIDE;
+    void reorder(QWidget *widget) const Q_DECL_OVERRIDE;
 };
 
 class QDESIGNER_SHARED_EXPORT LowerWidgetCommand: public ChangeZOrderCommand
@@ -157,8 +157,8 @@ public:
     void init(QWidget *widget);
 
 protected:
-    virtual QWidgetList reorderWidget(const QWidgetList &list, QWidget *widget) const;
-    virtual void reorder(QWidget *widget) const;
+    QWidgetList reorderWidget(const QWidgetList &list, QWidget *widget) const Q_DECL_OVERRIDE;
+    void reorder(QWidget *widget) const Q_DECL_OVERRIDE;
 };
 
 class QDESIGNER_SHARED_EXPORT AdjustWidgetSizeCommand: public QDesignerFormWindowCommand
diff --git a/src/designer/src/lib/shared/qdesigner_dnditem_p.h b/src/designer/src/lib/shared/qdesigner_dnditem_p.h
index 072ca9c..c6eb6b5 100644
--- a/src/designer/src/lib/shared/qdesigner_dnditem_p.h
+++ b/src/designer/src/lib/shared/qdesigner_dnditem_p.h
@@ -66,13 +66,13 @@ public:
     explicit QDesignerDnDItem(DropType type, QWidget *source = 0);
     virtual ~QDesignerDnDItem();
 
-    virtual DomUI *domUi() const;
-    virtual QWidget *decoration() const;
-    virtual QWidget *widget() const;
-    virtual QPoint hotSpot() const;
-    virtual QWidget *source() const;
+    DomUI *domUi() const Q_DECL_OVERRIDE;
+    QWidget *decoration() const Q_DECL_OVERRIDE;
+    QWidget *widget() const Q_DECL_OVERRIDE;
+    QPoint hotSpot() const Q_DECL_OVERRIDE;
+    QWidget *source() const Q_DECL_OVERRIDE;
 
-    virtual DropType type() const;
+    DropType type() const Q_DECL_OVERRIDE;
 
 protected:
     void setDomUi(DomUI *dom_ui);
diff --git a/src/designer/src/lib/shared/qdesigner_formbuilder_p.h b/src/designer/src/lib/shared/qdesigner_formbuilder_p.h
index cb1a3c8..44682eb 100644
--- a/src/designer/src/lib/shared/qdesigner_formbuilder_p.h
+++ b/src/designer/src/lib/shared/qdesigner_formbuilder_p.h
@@ -103,22 +103,22 @@ protected:
     using QFormBuilder::createDom;
     using QFormBuilder::create;
 
-    virtual QWidget *create(DomUI *ui, QWidget *parentWidget);
-    virtual DomWidget *createDom(QWidget *widget, DomWidget *ui_parentWidget, bool recursive = true);
-    virtual QWidget *create(DomWidget *ui_widget, QWidget *parentWidget);
-    virtual QLayout *create(DomLayout *ui_layout, QLayout *layout, QWidget *parentWidget);
-    virtual void createResources(DomResources *resources);
+    QWidget *create(DomUI *ui, QWidget *parentWidget) Q_DECL_OVERRIDE;
+    DomWidget *createDom(QWidget *widget, DomWidget *ui_parentWidget, bool recursive = true) Q_DECL_OVERRIDE;
+    QWidget *create(DomWidget *ui_widget, QWidget *parentWidget) Q_DECL_OVERRIDE;
+    QLayout *create(DomLayout *ui_layout, QLayout *layout, QWidget *parentWidget) Q_DECL_OVERRIDE;
+    void createResources(DomResources *resources) Q_DECL_OVERRIDE;
 
-    virtual QWidget *createWidget(const QString &widgetName, QWidget *parentWidget, const QString &name);
-    virtual bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget);
-    virtual bool addItem(DomLayoutItem *ui_item, QLayoutItem *item, QLayout *layout);
+    QWidget *createWidget(const QString &widgetName, QWidget *parentWidget, const QString &name) Q_DECL_OVERRIDE;
+    bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) Q_DECL_OVERRIDE;
+    bool addItem(DomLayoutItem *ui_item, QLayoutItem *item, QLayout *layout) Q_DECL_OVERRIDE;
 
     virtual QIcon nameToIcon(const QString &filePath, const QString &qrcPath);
     virtual QPixmap nameToPixmap(const QString &filePath, const QString &qrcPath);
 
-    virtual void applyProperties(QObject *o, const QList<DomProperty*> &properties);
+    void applyProperties(QObject *o, const QList<DomProperty*> &properties) Q_DECL_OVERRIDE;
 
-    virtual void loadExtraInfo(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget);
+    void loadExtraInfo(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) Q_DECL_OVERRIDE;
 
     QtResourceSet *internalResourceSet() const { return m_tempResourceSet; }
 
@@ -149,7 +149,7 @@ public:
                              const DeviceProfile &deviceProfile = DeviceProfile());
 
 protected:
-    virtual void createCustomWidgets(DomCustomWidgets *);
+    void createCustomWidgets(DomCustomWidgets *) Q_DECL_OVERRIDE;
 };
 
 
diff --git a/src/designer/src/lib/shared/qdesigner_introspection.cpp b/src/designer/src/lib/shared/qdesigner_introspection.cpp
index f013156..22f9d21 100644
--- a/src/designer/src/lib/shared/qdesigner_introspection.cpp
+++ b/src/designer/src/lib/shared/qdesigner_introspection.cpp
@@ -71,7 +71,7 @@ namespace  {
         virtual int keysToValue(const QString &keys) const { return m_enum.keysToValue(keys.toUtf8()); }
         virtual QString name() const                       { return m_name; }
         virtual QString scope() const                      { return m_scope; }
-        virtual QString separator() const;
+        QString separator() const Q_DECL_OVERRIDE;
         virtual int value(int index) const                 { return m_enum.value(index); }
         virtual QString valueToKey(int value) const        { return charToQString(m_enum.valueToKey(value)); }
         virtual QString valueToKeys(int value) const       { return charToQString(m_enum.valueToKeys(value)); }
@@ -106,7 +106,7 @@ namespace  {
         virtual Kind kind() const { return m_kind; }
 
         virtual AccessFlags accessFlags() const { return m_access; }
-        virtual Attributes attributes(const QObject *object = 0) const;
+        Attributes attributes(const QObject *object = 0) const Q_DECL_OVERRIDE;
 
         virtual QVariant::Type type() const { return m_property.type(); }
         virtual QString name() const        { return m_name; }
diff --git a/src/designer/src/lib/shared/qdesigner_introspection_p.h b/src/designer/src/lib/shared/qdesigner_introspection_p.h
index d8a2ced..ecff304 100644
--- a/src/designer/src/lib/shared/qdesigner_introspection_p.h
+++ b/src/designer/src/lib/shared/qdesigner_introspection_p.h
@@ -61,7 +61,7 @@ namespace qdesigner_internal {
         QDesignerIntrospection();
         virtual ~QDesignerIntrospection();
 
-        virtual const QDesignerMetaObjectInterface* metaObject(const QObject *object) const;
+        const QDesignerMetaObjectInterface* metaObject(const QObject *object) const Q_DECL_OVERRIDE;
 
         const QDesignerMetaObjectInterface* metaObjectForQMetaObject(const QMetaObject *metaObject) const;
     private:
diff --git a/src/designer/src/lib/shared/qdesigner_membersheet_p.h b/src/designer/src/lib/shared/qdesigner_membersheet_p.h
index a31b6e6..c275e4b 100644
--- a/src/designer/src/lib/shared/qdesigner_membersheet_p.h
+++ b/src/designer/src/lib/shared/qdesigner_membersheet_p.h
@@ -64,29 +64,29 @@ public:
     explicit QDesignerMemberSheet(QObject *object, QObject *parent = 0);
     virtual ~QDesignerMemberSheet();
 
-    virtual int indexOf(const QString &name) const;
+    int indexOf(const QString &name) const Q_DECL_OVERRIDE;
 
-    virtual int count() const;
-    virtual QString memberName(int index) const;
+    int count() const Q_DECL_OVERRIDE;
+    QString memberName(int index) const Q_DECL_OVERRIDE;
 
-    virtual QString memberGroup(int index) const;
-    virtual void setMemberGroup(int index, const QString &group);
+    QString memberGroup(int index) const Q_DECL_OVERRIDE;
+    void setMemberGroup(int index, const QString &group) Q_DECL_OVERRIDE;
 
-    virtual bool isVisible(int index) const;
-    virtual void setVisible(int index, bool b);
+    bool isVisible(int index) const Q_DECL_OVERRIDE;
+    void setVisible(int index, bool b) Q_DECL_OVERRIDE;
 
-    virtual bool isSignal(int index) const;
-    virtual bool isSlot(int index) const;
+    bool isSignal(int index) const Q_DECL_OVERRIDE;
+    bool isSlot(int index) const Q_DECL_OVERRIDE;
 
-    virtual bool inheritedFromWidget(int index) const;
+    bool inheritedFromWidget(int index) const Q_DECL_OVERRIDE;
 
     static bool signalMatchesSlot(const QString &signal, const QString &slot);
 
-    virtual QString declaredInClass(int index) const;
+    QString declaredInClass(int index) const Q_DECL_OVERRIDE;
 
-    virtual QString signature(int index) const;
-    virtual QList<QByteArray> parameterTypes(int index) const;
-    virtual QList<QByteArray> parameterNames(int index) const;
+    QString signature(int index) const Q_DECL_OVERRIDE;
+    QList<QByteArray> parameterTypes(int index) const Q_DECL_OVERRIDE;
+    QList<QByteArray> parameterNames(int index) const Q_DECL_OVERRIDE;
 
 private:
     QDesignerMemberSheetPrivate *d;
@@ -101,7 +101,7 @@ public:
     QDesignerMemberSheetFactory(QExtensionManager *parent = 0);
 
 protected:
-    virtual QObject *createExtension(QObject *object, const QString &iid, QObject *parent) const;
+    QObject *createExtension(QObject *object, const QString &iid, QObject *parent) const Q_DECL_OVERRIDE;
 };
 
 QT_END_NAMESPACE
diff --git a/src/designer/src/lib/shared/qdesigner_menu_p.h b/src/designer/src/lib/shared/qdesigner_menu_p.h
index 78735f7..efd5bb4 100644
--- a/src/designer/src/lib/shared/qdesigner_menu_p.h
+++ b/src/designer/src/lib/shared/qdesigner_menu_p.h
@@ -84,7 +84,7 @@ public:
     QDesignerMenu *parentMenu() const;
     QDesignerMenuBar *parentMenuBar() const;
 
-    virtual void setVisible(bool visible);
+    void setVisible(bool visible) Q_DECL_OVERRIDE;
 
     void adjustSpecialActions();
 
@@ -114,15 +114,15 @@ private slots:
     void slotAdjustSizeNow();
 
 protected:
-    virtual void actionEvent(QActionEvent *event);
-    virtual void dragEnterEvent(QDragEnterEvent *event);
-    virtual void dragMoveEvent(QDragMoveEvent *event);
-    virtual void dragLeaveEvent(QDragLeaveEvent *event);
-    virtual void dropEvent(QDropEvent *event);
-    virtual void paintEvent(QPaintEvent *event);
-    virtual void keyPressEvent(QKeyEvent *event);
-    virtual void keyReleaseEvent(QKeyEvent *event);
-    virtual void showEvent(QShowEvent *event);
+    void actionEvent(QActionEvent *event) Q_DECL_OVERRIDE;
+    void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE;
+    void dragMoveEvent(QDragMoveEvent *event) Q_DECL_OVERRIDE;
+    void dragLeaveEvent(QDragLeaveEvent *event) Q_DECL_OVERRIDE;
+    void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE;
+    void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE;
+    void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
+    void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
+    void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
 
     bool handleEvent(QWidget *widget, QEvent *event);
     bool handleMouseDoubleClickEvent(QWidget *widget, QMouseEvent *event);
diff --git a/src/designer/src/lib/shared/qdesigner_menubar_p.h b/src/designer/src/lib/shared/qdesigner_menubar_p.h
index 28e2fd0..ef238c2 100644
--- a/src/designer/src/lib/shared/qdesigner_menubar_p.h
+++ b/src/designer/src/lib/shared/qdesigner_menubar_p.h
@@ -104,15 +104,15 @@ private slots:
     void slotRemoveMenuBar();
 
 protected:
-    virtual void actionEvent(QActionEvent *event);
-    virtual void dragEnterEvent(QDragEnterEvent *event);
-    virtual void dragMoveEvent(QDragMoveEvent *event);
-    virtual void dragLeaveEvent(QDragLeaveEvent *event);
-    virtual void dropEvent(QDropEvent *event);
-    virtual void paintEvent(QPaintEvent *event);
-    virtual void focusOutEvent(QFocusEvent *event);
-    virtual void keyPressEvent(QKeyEvent *event);
-    virtual void keyReleaseEvent(QKeyEvent *event);
+    void actionEvent(QActionEvent *event) Q_DECL_OVERRIDE;
+    void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE;
+    void dragMoveEvent(QDragMoveEvent *event) Q_DECL_OVERRIDE;
+    void dragLeaveEvent(QDragLeaveEvent *event) Q_DECL_OVERRIDE;
+    void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE;
+    void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE;
+    void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE;
+    void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
+    void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
 
     bool handleEvent(QWidget *widget, QEvent *event);
     bool handleMouseDoubleClickEvent(QWidget *widget, QMouseEvent *event);
diff --git a/src/designer/src/lib/shared/qdesigner_promotion_p.h b/src/designer/src/lib/shared/qdesigner_promotion_p.h
index 484f01e..628f2d1 100644
--- a/src/designer/src/lib/shared/qdesigner_promotion_p.h
+++ b/src/designer/src/lib/shared/qdesigner_promotion_p.h
@@ -60,22 +60,22 @@ namespace qdesigner_internal {
     public:
         explicit QDesignerPromotion(QDesignerFormEditorInterface *core);
 
-        virtual PromotedClasses promotedClasses() const;
+        PromotedClasses promotedClasses() const Q_DECL_OVERRIDE;
 
-        virtual QSet<QString> referencedPromotedClassNames() const;
+        QSet<QString> referencedPromotedClassNames() const Q_DECL_OVERRIDE;
 
         virtual bool addPromotedClass(const QString &baseClass,
                                       const QString &className,
                                       const QString &includeFile,
                                       QString *errorMessage);
 
-        virtual bool removePromotedClass(const QString &className, QString *errorMessage);
+        bool removePromotedClass(const QString &className, QString *errorMessage) Q_DECL_OVERRIDE;
 
-        virtual bool changePromotedClassName(const QString &oldclassName, const QString &newClassName, QString *errorMessage);
+        bool changePromotedClassName(const QString &oldclassName, const QString &newClassName, QString *errorMessage) Q_DECL_OVERRIDE;
 
-        virtual bool setPromotedClassIncludeFile(const QString &className, const QString &includeFile, QString *errorMessage);
+        bool setPromotedClassIncludeFile(const QString &className, const QString &includeFile, QString *errorMessage) Q_DECL_OVERRIDE;
 
-        virtual QList<QDesignerWidgetDataBaseItemInterface *> promotionBaseClasses() const;
+        QList<QDesignerWidgetDataBaseItemInterface *> promotionBaseClasses() const Q_DECL_OVERRIDE;
 
     private:
         bool canBePromoted(const QDesignerWidgetDataBaseItemInterface *) const;
diff --git a/src/designer/src/lib/shared/qdesigner_propertysheet_p.h b/src/designer/src/lib/shared/qdesigner_propertysheet_p.h
index 355e613..660ac37 100644
--- a/src/designer/src/lib/shared/qdesigner_propertysheet_p.h
+++ b/src/designer/src/lib/shared/qdesigner_propertysheet_p.h
@@ -77,35 +77,35 @@ public:
     explicit QDesignerPropertySheet(QObject *object, QObject *parent = 0);
     virtual ~QDesignerPropertySheet();
 
-    virtual int indexOf(const QString &name) const;
+    int indexOf(const QString &name) const Q_DECL_OVERRIDE;
 
-    virtual int count() const;
-    virtual QString propertyName(int index) const;
+    int count() const Q_DECL_OVERRIDE;
+    QString propertyName(int index) const Q_DECL_OVERRIDE;
 
-    virtual QString propertyGroup(int index) const;
-    virtual void setPropertyGroup(int index, const QString &group);
+    QString propertyGroup(int index) const Q_DECL_OVERRIDE;
+    void setPropertyGroup(int index, const QString &group) Q_DECL_OVERRIDE;
 
-    virtual bool hasReset(int index) const;
-    virtual bool reset(int index);
+    bool hasReset(int index) const Q_DECL_OVERRIDE;
+    bool reset(int index) Q_DECL_OVERRIDE;
 
-    virtual bool isAttribute(int index) const;
-    virtual void setAttribute(int index, bool b);
+    bool isAttribute(int index) const Q_DECL_OVERRIDE;
+    void setAttribute(int index, bool b) Q_DECL_OVERRIDE;
 
-    virtual bool isVisible(int index) const;
-    virtual void setVisible(int index, bool b);
+    bool isVisible(int index) const Q_DECL_OVERRIDE;
+    void setVisible(int index, bool b) Q_DECL_OVERRIDE;
 
-    virtual QVariant property(int index) const;
-    virtual void setProperty(int index, const QVariant &value);
+    QVariant property(int index) const Q_DECL_OVERRIDE;
+    void setProperty(int index, const QVariant &value) Q_DECL_OVERRIDE;
 
-    virtual bool isChanged(int index) const;
+    bool isChanged(int index) const Q_DECL_OVERRIDE;
 
-    virtual void setChanged(int index, bool changed);
+    void setChanged(int index, bool changed) Q_DECL_OVERRIDE;
 
-    virtual bool dynamicPropertiesAllowed() const;
-    virtual int addDynamicProperty(const QString &propertyName, const QVariant &value);
-    virtual bool removeDynamicProperty(int index);
-    virtual bool isDynamicProperty(int index) const;
-    virtual bool canAddDynamicProperty(const QString &propertyName) const;
+    bool dynamicPropertiesAllowed() const Q_DECL_OVERRIDE;
+    int addDynamicProperty(const QString &propertyName, const QVariant &value) Q_DECL_OVERRIDE;
+    bool removeDynamicProperty(int index) Q_DECL_OVERRIDE;
+    bool isDynamicProperty(int index) const Q_DECL_OVERRIDE;
+    bool canAddDynamicProperty(const QString &propertyName) const Q_DECL_OVERRIDE;
 
     bool isDefaultDynamicProperty(int index) const;
 
@@ -118,7 +118,7 @@ public:
     void setIconCache(qdesigner_internal::DesignerIconCache *cache);
     int createFakeProperty(const QString &propertyName, const QVariant &value = QVariant());
 
-    virtual bool isEnabled(int index) const;
+    bool isEnabled(int index) const Q_DECL_OVERRIDE;
     QObject *object() const;
 
     static bool internalDynamicPropertiesEnabled();
@@ -223,7 +223,7 @@ public:
 
 private:
     // Does a  qobject_cast on  the object.
-    virtual QObject *createPropertySheet(QObject *qObject, QObject *parent) const;
+    QObject *createPropertySheet(QObject *qObject, QObject *parent) const Q_DECL_OVERRIDE;
 };
 
 template <class Object, class PropertySheet>
diff --git a/src/designer/src/lib/shared/qdesigner_qsettings_p.h b/src/designer/src/lib/shared/qdesigner_qsettings_p.h
index 7db6422..2d94093 100644
--- a/src/designer/src/lib/shared/qdesigner_qsettings_p.h
+++ b/src/designer/src/lib/shared/qdesigner_qsettings_p.h
@@ -59,13 +59,13 @@ class QDESIGNER_SHARED_EXPORT QDesignerQSettings : public QDesignerSettingsInter
 public:
     QDesignerQSettings();
 
-    virtual void beginGroup(const QString &prefix);
+    void beginGroup(const QString &prefix) Q_DECL_OVERRIDE;
     virtual void endGroup();
 
-    virtual bool contains(const QString &key) const;
-    virtual void setValue(const QString &key, const QVariant &value);
-    virtual QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const;
-    virtual void remove(const QString &key);
+    bool contains(const QString &key) const Q_DECL_OVERRIDE;
+    void setValue(const QString &key, const QVariant &value) Q_DECL_OVERRIDE;
+    QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const Q_DECL_OVERRIDE;
+    void remove(const QString &key) Q_DECL_OVERRIDE;
 
     // The application name to be used for settings. Allows for including
     // the Qt version to prevent settings of different Qt versions from
diff --git a/src/designer/src/lib/shared/qdesigner_stackedbox_p.h b/src/designer/src/lib/shared/qdesigner_stackedbox_p.h
index ccba236..9c5ce74 100644
--- a/src/designer/src/lib/shared/qdesigner_stackedbox_p.h
+++ b/src/designer/src/lib/shared/qdesigner_stackedbox_p.h
@@ -119,7 +119,7 @@ private slots:
     void changeOrder();
 
 protected:
-    virtual void gotoPage(int page);
+    void gotoPage(int page) Q_DECL_OVERRIDE;
 
 private:
     QAction *m_actionPreviousPage;
@@ -136,10 +136,10 @@ class QDESIGNER_SHARED_EXPORT QStackedWidgetPropertySheet : public QDesignerProp
 public:
     explicit QStackedWidgetPropertySheet(QStackedWidget *object, QObject *parent = 0);
 
-    virtual void setProperty(int index, const QVariant &value);
-    virtual QVariant property(int index) const;
-    virtual bool reset(int index);
-    virtual bool isEnabled(int index) const;
+    void setProperty(int index, const QVariant &value) Q_DECL_OVERRIDE;
+    QVariant property(int index) const Q_DECL_OVERRIDE;
+    bool reset(int index) Q_DECL_OVERRIDE;
+    bool isEnabled(int index) const Q_DECL_OVERRIDE;
 
     // Check whether the property is to be saved. Returns false for the page
     // properties (as the property sheet has no concept of 'stored')
diff --git a/src/designer/src/lib/shared/qdesigner_tabwidget_p.h b/src/designer/src/lib/shared/qdesigner_tabwidget_p.h
index b33fabf..17a7af9 100644
--- a/src/designer/src/lib/shared/qdesigner_tabwidget_p.h
+++ b/src/designer/src/lib/shared/qdesigner_tabwidget_p.h
@@ -80,7 +80,7 @@ public:
     // Add context menu and return page submenu or 0.
     QMenu *addContextMenuActions(QMenu *popup);
 
-    virtual bool eventFilter(QObject *o, QEvent *e);
+    bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE;
 
     QDesignerFormWindowInterface *formWindow() const;
 
@@ -113,10 +113,10 @@ class QDESIGNER_SHARED_EXPORT QTabWidgetPropertySheet : public QDesignerProperty
 public:
     explicit QTabWidgetPropertySheet(QTabWidget *object, QObject *parent = 0);
 
-    virtual void setProperty(int index, const QVariant &value);
-    virtual QVariant property(int index) const;
-    virtual bool reset(int index);
-    virtual bool isEnabled(int index) const;
+    void setProperty(int index, const QVariant &value) Q_DECL_OVERRIDE;
+    QVariant property(int index) const Q_DECL_OVERRIDE;
+    bool reset(int index) Q_DECL_OVERRIDE;
+    bool isEnabled(int index) const Q_DECL_OVERRIDE;
 
     // Check whether the property is to be saved. Returns false for the page
     // properties (as the property sheet has no concept of 'stored')
diff --git a/src/designer/src/lib/shared/qdesigner_taskmenu_p.h b/src/designer/src/lib/shared/qdesigner_taskmenu_p.h
index a538cb2..c74c2aa 100644
--- a/src/designer/src/lib/shared/qdesigner_taskmenu_p.h
+++ b/src/designer/src/lib/shared/qdesigner_taskmenu_p.h
@@ -74,7 +74,7 @@ public:
 
     QWidget *widget() const;
 
-    virtual QList<QAction*> taskActions() const;
+    QList<QAction*> taskActions() const Q_DECL_OVERRIDE;
 
     enum PropertyMode { CurrentWidgetMode, MultiSelectionMode };
 
diff --git a/src/designer/src/lib/shared/qdesigner_toolbar_p.h b/src/designer/src/lib/shared/qdesigner_toolbar_p.h
index c8b3c6f..f2ca48f 100644
--- a/src/designer/src/lib/shared/qdesigner_toolbar_p.h
+++ b/src/designer/src/lib/shared/qdesigner_toolbar_p.h
@@ -87,7 +87,7 @@ public:
     // Utility to create an action
     static QAction *createAction(QDesignerFormWindowInterface *fw, const QString &objectName, bool separator);
 
-    virtual bool eventFilter (QObject *watched, QEvent *event);
+    bool eventFilter (QObject *watched, QEvent *event) Q_DECL_OVERRIDE;
 
     // Helper for task menu extension
     QList<QAction *> contextMenuActions(const QPoint &globalPos = QPoint(-1, -1));
diff --git a/src/designer/src/lib/shared/qdesigner_toolbox_p.h b/src/designer/src/lib/shared/qdesigner_toolbox_p.h
index 3f393e0..1d8f4b9 100644
--- a/src/designer/src/lib/shared/qdesigner_toolbox_p.h
+++ b/src/designer/src/lib/shared/qdesigner_toolbox_p.h
@@ -101,10 +101,10 @@ class QDESIGNER_SHARED_EXPORT QToolBoxWidgetPropertySheet : public QDesignerProp
 public:
     explicit QToolBoxWidgetPropertySheet(QToolBox *object, QObject *parent = 0);
 
-    virtual void setProperty(int index, const QVariant &value);
-    virtual QVariant property(int index) const;
-    virtual bool reset(int index);
-    virtual bool isEnabled(int index) const;
+    void setProperty(int index, const QVariant &value) Q_DECL_OVERRIDE;
+    QVariant property(int index) const Q_DECL_OVERRIDE;
+    bool reset(int index) Q_DECL_OVERRIDE;
+    bool isEnabled(int index) const Q_DECL_OVERRIDE;
 
     // Check whether the property is to be saved. Returns false for the page
     // properties (as the property sheet has no concept of 'stored')
diff --git a/src/designer/src/lib/shared/qdesigner_widget_p.h b/src/designer/src/lib/shared/qdesigner_widget_p.h
index de09df8..4ac6031 100644
--- a/src/designer/src/lib/shared/qdesigner_widget_p.h
+++ b/src/designer/src/lib/shared/qdesigner_widget_p.h
@@ -72,7 +72,7 @@ public:
     { return QWidget::minimumSizeHint().expandedTo(QSize(16, 16)); }
 
 protected:
-    virtual void paintEvent(QPaintEvent *e);
+    void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE;
 
 private:
     qdesigner_internal::FormWindowBase* m_formWindow;
diff --git a/src/designer/src/lib/shared/qdesigner_widgetitem_p.h b/src/designer/src/lib/shared/qdesigner_widgetitem_p.h
index c63b3be..59f9a07 100644
--- a/src/designer/src/lib/shared/qdesigner_widgetitem_p.h
+++ b/src/designer/src/lib/shared/qdesigner_widgetitem_p.h
@@ -81,8 +81,8 @@ public:
 
     inline QWidget *constWidget() const { return const_cast<QDesignerWidgetItem*>(this)->widget(); }
 
-    virtual QSize minimumSize() const;
-    virtual QSize sizeHint()    const;
+    QSize minimumSize() const Q_DECL_OVERRIDE;
+    QSize sizeHint()    const Q_DECL_OVERRIDE;
 
     // Resize: Takes effect if the contained widget does not have a layout
     QSize nonLaidOutMinSize() const;
@@ -103,7 +103,7 @@ public:
 
     static bool subjectToStretch(const QLayout *layout, QWidget *w);
 
-    virtual bool eventFilter(QObject * watched, QEvent * event);
+    bool eventFilter(QObject * watched, QEvent * event) Q_DECL_OVERRIDE;
 
 private slots:
     void layoutChanged();
diff --git a/src/designer/src/lib/shared/qlayout_widget.cpp b/src/designer/src/lib/shared/qlayout_widget.cpp
index e245e21..b520894 100644
--- a/src/designer/src/lib/shared/qlayout_widget.cpp
+++ b/src/designer/src/lib/shared/qlayout_widget.cpp
@@ -466,13 +466,13 @@ QRect LayoutHelper::itemInfo(QLayout *lt, const QWidget *widget) const
     public:
         BoxLayoutHelper(const Qt::Orientation orientation) : m_orientation(orientation) {}
 
-        virtual QRect itemInfo(QLayout *lt, int index) const;
-        virtual void insertWidget(QLayout *lt, const QRect &info, QWidget *w);
-        virtual void removeWidget(QLayout *lt, QWidget *widget);
-        virtual void replaceWidget(QLayout *lt, QWidget *before, QWidget *after);
+        QRect itemInfo(QLayout *lt, int index) const Q_DECL_OVERRIDE;
+        void insertWidget(QLayout *lt, const QRect &info, QWidget *w) Q_DECL_OVERRIDE;
+        void removeWidget(QLayout *lt, QWidget *widget) Q_DECL_OVERRIDE;
+        void replaceWidget(QLayout *lt, QWidget *before, QWidget *after) Q_DECL_OVERRIDE;
 
-        virtual void pushState(const QDesignerFormEditorInterface *, const QWidget *);
-        virtual void popState(const QDesignerFormEditorInterface *, QWidget *);
+        void pushState(const QDesignerFormEditorInterface *, const QWidget *) Q_DECL_OVERRIDE;
+        void popState(const QDesignerFormEditorInterface *, QWidget *) Q_DECL_OVERRIDE;
 
         virtual bool canSimplify(const QDesignerFormEditorInterface *, const QWidget *, const QRect &) const { return  false; }
         virtual void simplify(const QDesignerFormEditorInterface *, QWidget *, const QRect &) {}
@@ -886,16 +886,16 @@ QRect LayoutHelper::itemInfo(QLayout *lt, const QWidget *widget) const
     public:
         GridLayoutHelper() {}
 
-        virtual QRect itemInfo(QLayout *lt, int index) const;
-        virtual void insertWidget(QLayout *lt, const QRect &info, QWidget *w);
-        virtual void removeWidget(QLayout *lt, QWidget *widget);
-        virtual void replaceWidget(QLayout *lt, QWidget *before, QWidget *after);
+        QRect itemInfo(QLayout *lt, int index) const Q_DECL_OVERRIDE;
+        void insertWidget(QLayout *lt, const QRect &info, QWidget *w) Q_DECL_OVERRIDE;
+        void removeWidget(QLayout *lt, QWidget *widget) Q_DECL_OVERRIDE;
+        void replaceWidget(QLayout *lt, QWidget *before, QWidget *after) Q_DECL_OVERRIDE;
 
-        virtual void pushState(const QDesignerFormEditorInterface *core, const QWidget *widgetWithManagedLayout);
-        virtual void popState(const QDesignerFormEditorInterface *core, QWidget *widgetWithManagedLayout);
+        void pushState(const QDesignerFormEditorInterface *core, const QWidget *widgetWithManagedLayout) Q_DECL_OVERRIDE;
+        void popState(const QDesignerFormEditorInterface *core, QWidget *widgetWithManagedLayout) Q_DECL_OVERRIDE;
 
-        virtual bool canSimplify(const QDesignerFormEditorInterface *core, const QWidget *widgetWithManagedLayout, const QRect &restrictionArea) const;
-        virtual void simplify(const QDesignerFormEditorInterface *core, QWidget *widgetWithManagedLayout, const QRect &restrictionArea);
+        bool canSimplify(const QDesignerFormEditorInterface *core, const QWidget *widgetWithManagedLayout, const QRect &restrictionArea) const Q_DECL_OVERRIDE;
+        void simplify(const QDesignerFormEditorInterface *core, QWidget *widgetWithManagedLayout, const QRect &restrictionArea) Q_DECL_OVERRIDE;
 
         static void insertRow(QGridLayout *grid, int row);
 
@@ -1043,16 +1043,16 @@ QRect LayoutHelper::itemInfo(QLayout *lt, const QWidget *widget) const
 
         FormLayoutHelper() {}
 
-        virtual QRect itemInfo(QLayout *lt, int index) const;
-        virtual void insertWidget(QLayout *lt, const QRect &info, QWidget *w);
-        virtual void removeWidget(QLayout *lt, QWidget *widget);
-        virtual void replaceWidget(QLayout *lt, QWidget *before, QWidget *after);
+        QRect itemInfo(QLayout *lt, int index) const Q_DECL_OVERRIDE;
+        void insertWidget(QLayout *lt, const QRect &info, QWidget *w) Q_DECL_OVERRIDE;
+        void removeWidget(QLayout *lt, QWidget *widget) Q_DECL_OVERRIDE;
+        void replaceWidget(QLayout *lt, QWidget *before, QWidget *after) Q_DECL_OVERRIDE;
 
-        virtual void pushState(const QDesignerFormEditorInterface *core, const QWidget *widgetWithManagedLayout);
-        virtual void popState(const QDesignerFormEditorInterface *core, QWidget *widgetWithManagedLayout);
+        void pushState(const QDesignerFormEditorInterface *core, const QWidget *widgetWithManagedLayout) Q_DECL_OVERRIDE;
+        void popState(const QDesignerFormEditorInterface *core, QWidget *widgetWithManagedLayout) Q_DECL_OVERRIDE;
 
-        virtual bool canSimplify(const QDesignerFormEditorInterface *core, const QWidget *, const QRect &) const;
-        virtual void simplify(const QDesignerFormEditorInterface *, QWidget *, const QRect &);
+        bool canSimplify(const QDesignerFormEditorInterface *core, const QWidget *, const QRect &) const Q_DECL_OVERRIDE;
+        void simplify(const QDesignerFormEditorInterface *, QWidget *, const QRect &) Q_DECL_OVERRIDE;
 
     private:
         static FormLayoutState state(const QFormLayout *lt);
@@ -1565,8 +1565,8 @@ class QBoxLayoutSupport: public QLayoutSupport
 public:
     QBoxLayoutSupport(QDesignerFormWindowInterface *formWindow, QWidget *widget, Qt::Orientation orientation, QObject *parent = 0);
 
-    virtual void insertWidget(QWidget *widget, const QPair<int, int> &cell);
-    virtual void removeWidget(QWidget *widget);
+    void insertWidget(QWidget *widget, const QPair<int, int> &cell) Q_DECL_OVERRIDE;
+    void removeWidget(QWidget *widget) Q_DECL_OVERRIDE;
     virtual void simplify() {}
     virtual void insertRow(int /*row*/) {}
     virtual void insertColumn(int /*column*/) {}
@@ -1575,10 +1575,10 @@ public:
     using QLayoutSupport::findItemAt;
 
 private:
-    virtual void setCurrentCellFromIndicatorOnEmptyCell(int index);
-    virtual void setCurrentCellFromIndicator(Qt::Orientation indicatorOrientation, int index, int increment);
-    virtual bool supportsIndicatorOrientation(Qt::Orientation indicatorOrientation) const;
-    virtual QRect extendedGeometry(int index) const;
+    void setCurrentCellFromIndicatorOnEmptyCell(int index) Q_DECL_OVERRIDE;
+    void setCurrentCellFromIndicator(Qt::Orientation indicatorOrientation, int index, int increment) Q_DECL_OVERRIDE;
+    bool supportsIndicatorOrientation(Qt::Orientation indicatorOrientation) const Q_DECL_OVERRIDE;
+    QRect extendedGeometry(int index) const Q_DECL_OVERRIDE;
 
     const Qt::Orientation m_orientation;
 };
@@ -1699,7 +1699,7 @@ public:
 
     void insertWidget(QWidget *widget, const QPair<int, int> &cell);
     virtual void removeWidget(QWidget *widget) { helper()->removeWidget(layout(), widget); }
-    virtual int findItemAt(int row, int column) const;
+    int findItemAt(int row, int column) const Q_DECL_OVERRIDE;
     using QLayoutSupport::findItemAt;
 
 protected:
@@ -1709,11 +1709,11 @@ protected:
 
 private:
 
-    virtual void setCurrentCellFromIndicatorOnEmptyCell(int index);
-    virtual void setCurrentCellFromIndicator(Qt::Orientation indicatorOrientation, int index, int increment);
+    void setCurrentCellFromIndicatorOnEmptyCell(int index) Q_DECL_OVERRIDE;
+    void setCurrentCellFromIndicator(Qt::Orientation indicatorOrientation, int index, int increment) Q_DECL_OVERRIDE;
     virtual bool supportsIndicatorOrientation(Qt::Orientation) const { return true; }
 
-    virtual QRect extendedGeometry(int index) const;
+    QRect extendedGeometry(int index) const Q_DECL_OVERRIDE;
 
     // Overwrite to check the insertion position (if there are limits)
     virtual void checkCellForInsertion(int * /*row*/, int * /*col*/) const {}
@@ -1812,8 +1812,8 @@ public:
     QGridLayoutSupport(QDesignerFormWindowInterface *formWindow, QWidget *widget, QObject *parent = 0);
 
     virtual void simplify();
-    virtual void insertRow(int row);
-    virtual void insertColumn(int column);
+    void insertRow(int row) Q_DECL_OVERRIDE;
+    void insertColumn(int column) Q_DECL_OVERRIDE;
 
 private:
 };
@@ -1863,7 +1863,7 @@ public:
     virtual void insertColumn(int /*column*/) {}
 
 private:
-    virtual void checkCellForInsertion(int * row, int *col) const;
+    void checkCellForInsertion(int * row, int *col) const Q_DECL_OVERRIDE;
 };
 
 QFormLayoutSupport::QFormLayoutSupport(QDesignerFormWindowInterface *formWindow, QWidget *widget, QObject *parent) :
diff --git a/src/designer/src/lib/shared/qlayout_widget_p.h b/src/designer/src/lib/shared/qlayout_widget_p.h
index 93e75f1..52f9672 100644
--- a/src/designer/src/lib/shared/qlayout_widget_p.h
+++ b/src/designer/src/lib/shared/qlayout_widget_p.h
@@ -187,13 +187,13 @@ public:
 
     virtual QPair<int, int> currentCell() const               { return m_currentCell; }
 
-    virtual int findItemAt(const QPoint &pos) const;
-    virtual int indexOf(QWidget *widget) const;
-    virtual int indexOf(QLayoutItem *item) const;
+    int findItemAt(const QPoint &pos) const Q_DECL_OVERRIDE;
+    int indexOf(QWidget *widget) const Q_DECL_OVERRIDE;
+    int indexOf(QLayoutItem *item) const Q_DECL_OVERRIDE;
 
-    virtual void adjustIndicator(const QPoint &pos, int index);
+    void adjustIndicator(const QPoint &pos, int index) Q_DECL_OVERRIDE;
 
-    virtual QList<QWidget*> widgets(QLayout *layout) const;
+    QList<QWidget*> widgets(QLayout *layout) const Q_DECL_OVERRIDE;
 
     // Pad empty cells with dummy spacers. Called by layouting commands.
     static void createEmptyCells(QGridLayout *gridLayout);
@@ -268,8 +268,8 @@ public:
     inline QDesignerFormWindowInterface *formWindow() const    { return m_formWindow; }
 
 protected:
-    virtual bool event(QEvent *e);
-    virtual void paintEvent(QPaintEvent *e);
+    bool event(QEvent *e) Q_DECL_OVERRIDE;
+    void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE;
 
 private:
     QDesignerFormWindowInterface *m_formWindow;
diff --git a/src/designer/src/lib/shared/qtresourceview.cpp b/src/designer/src/lib/shared/qtresourceview.cpp
index 64ab204..af1d42c 100644
--- a/src/designer/src/lib/shared/qtresourceview.cpp
+++ b/src/designer/src/lib/shared/qtresourceview.cpp
@@ -82,7 +82,7 @@ public:
     ResourceListWidget(QWidget *parent = 0);
 
 protected:
-    virtual void startDrag(Qt::DropActions supportedActions);
+    void startDrag(Qt::DropActions supportedActions) Q_DECL_OVERRIDE;
 };
 
 ResourceListWidget::ResourceListWidget(QWidget *parent) :
diff --git a/src/designer/src/lib/shared/sheet_delegate_p.h b/src/designer/src/lib/shared/sheet_delegate_p.h
index 0b5f185..7eb3682 100644
--- a/src/designer/src/lib/shared/sheet_delegate_p.h
+++ b/src/designer/src/lib/shared/sheet_delegate_p.h
@@ -63,8 +63,8 @@ class QDESIGNER_SHARED_EXPORT SheetDelegate: public QItemDelegate
 public:
     SheetDelegate(QTreeView *view, QWidget *parent);
 
-    virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
-    virtual QSize sizeHint(const QStyleOptionViewItem &opt, const QModelIndex &index) const;
+    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
+    QSize sizeHint(const QStyleOptionViewItem &opt, const QModelIndex &index) const Q_DECL_OVERRIDE;
 
 private:
     QTreeView *m_view;
diff --git a/src/designer/src/lib/shared/signalslotdialog.cpp b/src/designer/src/lib/shared/signalslotdialog.cpp
index 64709c9..2e52cc4 100644
--- a/src/designer/src/lib/shared/signalslotdialog.cpp
+++ b/src/designer/src/lib/shared/signalslotdialog.cpp
@@ -126,8 +126,8 @@ namespace {
     class SignatureDelegate : public QItemDelegate {
     public:
         SignatureDelegate(QObject * parent = 0);
-        virtual QWidget * createEditor (QWidget * parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const;
-        virtual void setModelData (QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
+        QWidget * createEditor (QWidget * parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const Q_DECL_OVERRIDE;
+        void setModelData (QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const Q_DECL_OVERRIDE;
 
     private:
         QRegExp m_signatureRegexp;
diff --git a/src/designer/src/lib/shared/signalslotdialog_p.h b/src/designer/src/lib/shared/signalslotdialog_p.h
index 9c8385b..9c64b26 100644
--- a/src/designer/src/lib/shared/signalslotdialog_p.h
+++ b/src/designer/src/lib/shared/signalslotdialog_p.h
@@ -80,7 +80,7 @@ class SignatureModel : public QStandardItemModel {
 
 public:
     SignatureModel(QObject *parent = 0);
-    virtual bool setData (const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
+    bool setData (const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE;
 
 signals:
     void checkSignature(const QString &signature, bool *ok);
diff --git a/src/designer/src/lib/shared/spacer_widget_p.h b/src/designer/src/lib/shared/spacer_widget_p.h
index f6937ab..780f866 100644
--- a/src/designer/src/lib/shared/spacer_widget_p.h
+++ b/src/designer/src/lib/shared/spacer_widget_p.h
@@ -83,7 +83,7 @@ public:
     void setOrientation(Qt::Orientation o);
     void setInteractiveMode(bool b) { m_interactive = b; };
 
-    virtual bool event(QEvent *e);
+    bool event(QEvent *e) Q_DECL_OVERRIDE;
 
 protected:
     void paintEvent(QPaintEvent *e);
diff --git a/src/designer/src/lib/shared/textpropertyeditor.cpp b/src/designer/src/lib/shared/textpropertyeditor.cpp
index 4de72bb..92a4a9b 100644
--- a/src/designer/src/lib/shared/textpropertyeditor.cpp
+++ b/src/designer/src/lib/shared/textpropertyeditor.cpp
@@ -57,8 +57,8 @@ namespace {
         ReplacementValidator (QObject * parent,
                               const QString &offending,
                               const QString &replacement);
-        virtual void fixup ( QString & input ) const;
-        virtual State validate ( QString & input, int &pos) const;
+        void fixup ( QString & input ) const Q_DECL_OVERRIDE;
+        State validate ( QString & input, int &pos) const Q_DECL_OVERRIDE;
     private:
         const QString m_offending;
         const QString m_replacement;
@@ -86,7 +86,7 @@ namespace {
     class StyleSheetValidator : public ReplacementValidator {
     public:
         StyleSheetValidator (QObject * parent);
-        virtual State validate(QString & input, int &pos) const;
+        State validate(QString & input, int &pos) const Q_DECL_OVERRIDE;
     };
 
     StyleSheetValidator::StyleSheetValidator (QObject * parent) :
@@ -112,8 +112,8 @@ namespace {
     public:
         UrlValidator(QCompleter *completer, QObject *parent);
 
-        virtual State validate(QString &input, int &pos) const;
-        virtual void fixup(QString &input) const;
+        State validate(QString &input, int &pos) const Q_DECL_OVERRIDE;
+        void fixup(QString &input) const Q_DECL_OVERRIDE;
     private:
         QUrl guessUrlFromString(const QString &string) const;
         QCompleter *m_completer;
diff --git a/src/designer/src/lib/shared/textpropertyeditor_p.h b/src/designer/src/lib/shared/textpropertyeditor_p.h
index ca09ca2..40e0a54 100644
--- a/src/designer/src/lib/shared/textpropertyeditor_p.h
+++ b/src/designer/src/lib/shared/textpropertyeditor_p.h
@@ -92,8 +92,8 @@ namespace qdesigner_internal {
 
         QString text() const;
 
-        virtual QSize sizeHint () const;
-        virtual QSize minimumSizeHint () const;
+        QSize sizeHint () const Q_DECL_OVERRIDE;
+        QSize minimumSizeHint () const Q_DECL_OVERRIDE;
 
         void setAlignment(Qt::Alignment alignment);
 
diff --git a/src/designer/src/lib/shared/widgetdatabase_p.h b/src/designer/src/lib/shared/widgetdatabase_p.h
index 0440ecf..36612fe 100644
--- a/src/designer/src/lib/shared/widgetdatabase_p.h
+++ b/src/designer/src/lib/shared/widgetdatabase_p.h
@@ -153,9 +153,9 @@ public:
     explicit WidgetDataBase(QDesignerFormEditorInterface *core, QObject *parent = 0);
     virtual ~WidgetDataBase();
 
-    virtual QDesignerFormEditorInterface *core() const;
+    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
 
-    virtual int indexOfObject(QObject *o, bool resolveName = true) const;
+    int indexOfObject(QObject *o, bool resolveName = true) const Q_DECL_OVERRIDE;
 
     void remove(int index);
 
diff --git a/src/designer/src/lib/shared/widgetfactory.cpp b/src/designer/src/lib/shared/widgetfactory.cpp
index 2208db2..089e239 100644
--- a/src/designer/src/lib/shared/widgetfactory.cpp
+++ b/src/designer/src/lib/shared/widgetfactory.cpp
@@ -108,7 +108,7 @@ public:
 class ComboEventFilter : public QObject {
 public:
     explicit ComboEventFilter(QComboBox *parent) : QObject(parent) {}
-    virtual bool eventFilter(QObject *watched, QEvent *event);
+    bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE;
 };
 
 bool ComboEventFilter::eventFilter(QObject *watched, QEvent *event)
diff --git a/src/designer/src/lib/shared/widgetfactory_p.h b/src/designer/src/lib/shared/widgetfactory_p.h
index 8595c8d..eabff09 100644
--- a/src/designer/src/lib/shared/widgetfactory_p.h
+++ b/src/designer/src/lib/shared/widgetfactory_p.h
@@ -75,21 +75,21 @@ public:
     explicit WidgetFactory(QDesignerFormEditorInterface *core, QObject *parent = 0);
     ~WidgetFactory();
 
-    virtual QWidget* containerOfWidget(QWidget *widget) const;
-    virtual QWidget* widgetOfContainer(QWidget *widget) const;
+    QWidget* containerOfWidget(QWidget *widget) const Q_DECL_OVERRIDE;
+    QWidget* widgetOfContainer(QWidget *widget) const Q_DECL_OVERRIDE;
 
     QObject* createObject(const QString &className, QObject* parent) const;
 
-    virtual QWidget *createWidget(const QString &className, QWidget *parentWidget) const;
-    virtual QLayout *createLayout(QWidget *widget, QLayout *layout, int type) const;
+    QWidget *createWidget(const QString &className, QWidget *parentWidget) const Q_DECL_OVERRIDE;
+    QLayout *createLayout(QWidget *widget, QLayout *layout, int type) const Q_DECL_OVERRIDE;
 
-    virtual bool isPassiveInteractor(QWidget *widget);
-    virtual void initialize(QObject *object) const;
+    bool isPassiveInteractor(QWidget *widget) Q_DECL_OVERRIDE;
+    void initialize(QObject *object) const Q_DECL_OVERRIDE;
     void initializeCommon(QWidget *object) const;
     void initializePreview(QWidget *object) const;
 
 
-    virtual QDesignerFormEditorInterface *core() const;
+    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
 
     static QString classNameOf(QDesignerFormEditorInterface *core, const QObject* o);
 
diff --git a/src/designer/src/lib/shared/zoomwidget.cpp b/src/designer/src/lib/shared/zoomwidget.cpp
index 4b14268..ee55d7f 100644
--- a/src/designer/src/lib/shared/zoomwidget.cpp
+++ b/src/designer/src/lib/shared/zoomwidget.cpp
@@ -274,7 +274,7 @@ class ZoomedEventFilterRedirector : public QObject {
 
 public:
     explicit ZoomedEventFilterRedirector(ZoomWidget *zw, QObject *parent);
-    virtual bool eventFilter(QObject *watched, QEvent *event);
+    bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE;
 
 private:
     ZoomWidget *m_zw;
diff --git a/src/designer/src/lib/shared/zoomwidget_p.h b/src/designer/src/lib/shared/zoomwidget_p.h
index 69d6502..df1952f 100644
--- a/src/designer/src/lib/shared/zoomwidget_p.h
+++ b/src/designer/src/lib/shared/zoomwidget_p.h
@@ -149,7 +149,7 @@ public:
     explicit ZoomProxyWidget(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
 
 protected:
-    virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+    QVariant itemChange(GraphicsItemChange change, const QVariant &value) Q_DECL_OVERRIDE;
 };
 
 /* Zoom widget: A QGraphicsView-based container for a widget that allows for
@@ -183,8 +183,8 @@ public:
     void setItemAcceptDrops(bool);
     bool itemAcceptDrops() const;
 
-    virtual QSize minimumSizeHint() const;
-    virtual QSize sizeHint() const;
+    QSize minimumSizeHint() const Q_DECL_OVERRIDE;
+    QSize sizeHint() const Q_DECL_OVERRIDE;
 
     bool zoomedEventFilter(QObject *watched, QEvent *event);
 
diff --git a/src/designer/src/lib/uilib/formbuilder.h b/src/designer/src/lib/uilib/formbuilder.h
index 16174df..2ef0b52 100644
--- a/src/designer/src/lib/uilib/formbuilder.h
+++ b/src/designer/src/lib/uilib/formbuilder.h
@@ -66,23 +66,23 @@ public:
     QList<QDesignerCustomWidgetInterface*> customWidgets() const;
 
 protected:
-    virtual QWidget *create(DomUI *ui, QWidget *parentWidget);
-    virtual QWidget *create(DomWidget *ui_widget, QWidget *parentWidget);
-    virtual QLayout *create(DomLayout *ui_layout, QLayout *layout, QWidget *parentWidget);
-    virtual QLayoutItem *create(DomLayoutItem *ui_layoutItem, QLayout *layout, QWidget *parentWidget);
-    virtual QAction *create(DomAction *ui_action, QObject *parent);
-    virtual QActionGroup *create(DomActionGroup *ui_action_group, QObject *parent);
+    QWidget *create(DomUI *ui, QWidget *parentWidget) Q_DECL_OVERRIDE;
+    QWidget *create(DomWidget *ui_widget, QWidget *parentWidget) Q_DECL_OVERRIDE;
+    QLayout *create(DomLayout *ui_layout, QLayout *layout, QWidget *parentWidget) Q_DECL_OVERRIDE;
+    QLayoutItem *create(DomLayoutItem *ui_layoutItem, QLayout *layout, QWidget *parentWidget) Q_DECL_OVERRIDE;
+    QAction *create(DomAction *ui_action, QObject *parent) Q_DECL_OVERRIDE;
+    QActionGroup *create(DomActionGroup *ui_action_group, QObject *parent) Q_DECL_OVERRIDE;
 
-    virtual QWidget *createWidget(const QString &widgetName, QWidget *parentWidget, const QString &name);
-    virtual QLayout *createLayout(const QString &layoutName, QObject *parent, const QString &name);
+    QWidget *createWidget(const QString &widgetName, QWidget *parentWidget, const QString &name) Q_DECL_OVERRIDE;
+    QLayout *createLayout(const QString &layoutName, QObject *parent, const QString &name) Q_DECL_OVERRIDE;
 
-    virtual void createConnections(DomConnections *connections, QWidget *widget);
+    void createConnections(DomConnections *connections, QWidget *widget) Q_DECL_OVERRIDE;
 
-    virtual bool addItem(DomLayoutItem *ui_item, QLayoutItem *item, QLayout *layout);
-    virtual bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget);
+    bool addItem(DomLayoutItem *ui_item, QLayoutItem *item, QLayout *layout) Q_DECL_OVERRIDE;
+    bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) Q_DECL_OVERRIDE;
 
     virtual void updateCustomWidgets();
-    virtual void applyProperties(QObject *o, const QList<DomProperty*> &properties);
+    void applyProperties(QObject *o, const QList<DomProperty*> &properties) Q_DECL_OVERRIDE;
 
     static QWidget *widgetByName(QWidget *topLevel, const QString &name);
 
diff --git a/src/designer/src/plugins/activeqt/qaxwidgetextrainfo.h b/src/designer/src/plugins/activeqt/qaxwidgetextrainfo.h
index 7dd4560..9fda8ef 100644
--- a/src/designer/src/plugins/activeqt/qaxwidgetextrainfo.h
+++ b/src/designer/src/plugins/activeqt/qaxwidgetextrainfo.h
@@ -51,14 +51,14 @@ class QAxWidgetExtraInfo: public QObject, public QDesignerExtraInfoExtension
 public:
     QAxWidgetExtraInfo(QDesignerAxWidget *widget, QDesignerFormEditorInterface *core, QObject *parent);
 
-    virtual QWidget *widget() const;
-    virtual QDesignerFormEditorInterface *core() const;
+    QWidget *widget() const Q_DECL_OVERRIDE;
+    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
 
-    virtual bool saveUiExtraInfo(DomUI *ui);
-    virtual bool loadUiExtraInfo(DomUI *ui);
+    bool saveUiExtraInfo(DomUI *ui) Q_DECL_OVERRIDE;
+    bool loadUiExtraInfo(DomUI *ui) Q_DECL_OVERRIDE;
 
-    virtual bool saveWidgetExtraInfo(DomWidget *ui_widget);
-    virtual bool loadWidgetExtraInfo(DomWidget *ui_widget);
+    bool saveWidgetExtraInfo(DomWidget *ui_widget) Q_DECL_OVERRIDE;
+    bool loadWidgetExtraInfo(DomWidget *ui_widget) Q_DECL_OVERRIDE;
 
 private:
     QPointer<QDesignerAxWidget> m_widget;
@@ -72,7 +72,7 @@ public:
     explicit QAxWidgetExtraInfoFactory(QDesignerFormEditorInterface *core, QExtensionManager *parent = 0);
 
 protected:
-    virtual QObject *createExtension(QObject *object, const QString &iid, QObject *parent) const;
+    QObject *createExtension(QObject *object, const QString &iid, QObject *parent) const Q_DECL_OVERRIDE;
 
 private:
     QDesignerFormEditorInterface *m_core;
diff --git a/src/designer/src/plugins/activeqt/qaxwidgetplugin.h b/src/designer/src/plugins/activeqt/qaxwidgetplugin.h
index 8a6709a..9c94a14 100644
--- a/src/designer/src/plugins/activeqt/qaxwidgetplugin.h
+++ b/src/designer/src/plugins/activeqt/qaxwidgetplugin.h
@@ -49,17 +49,17 @@ class QAxWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
 public:
     explicit QAxWidgetPlugin(QObject *parent = 0);
 
-    virtual QString name() const;
-    virtual QString group() const;
-    virtual QString toolTip() const;
-    virtual QString whatsThis() const;
-    virtual QString includeFile() const;
-    virtual QIcon icon() const;
-    virtual bool isContainer() const;
-    virtual QWidget *createWidget(QWidget *parent);
-    virtual bool isInitialized() const;
-    virtual void initialize(QDesignerFormEditorInterface *core);
-    virtual QString domXml() const;
+    QString name() const Q_DECL_OVERRIDE;
+    QString group() const Q_DECL_OVERRIDE;
+    QString toolTip() const Q_DECL_OVERRIDE;
+    QString whatsThis() const Q_DECL_OVERRIDE;
+    QString includeFile() const Q_DECL_OVERRIDE;
+    QIcon icon() const Q_DECL_OVERRIDE;
+    bool isContainer() const Q_DECL_OVERRIDE;
+    QWidget *createWidget(QWidget *parent) Q_DECL_OVERRIDE;
+    bool isInitialized() const Q_DECL_OVERRIDE;
+    void initialize(QDesignerFormEditorInterface *core) Q_DECL_OVERRIDE;
+    QString domXml() const Q_DECL_OVERRIDE;
 
 private:
     QDesignerFormEditorInterface *m_core;
diff --git a/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h b/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h
index a609061..57857ac 100644
--- a/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h
+++ b/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h
@@ -57,10 +57,10 @@ class QAxWidgetPropertySheet: public QDesignerPropertySheet
 public:
     explicit QAxWidgetPropertySheet(QDesignerAxWidget *object, QObject *parent = 0);
 
-    virtual bool isEnabled(int index) const;
-    virtual QVariant property(int index) const;
-    virtual void setProperty(int index, const QVariant &value);
-    virtual bool reset(int index);
+    bool isEnabled(int index) const Q_DECL_OVERRIDE;
+    QVariant property(int index) const Q_DECL_OVERRIDE;
+    void setProperty(int index, const QVariant &value) Q_DECL_OVERRIDE;
+    bool reset(int index) Q_DECL_OVERRIDE;
     int indexOf(const QString &name) const;
     bool dynamicPropertiesAllowed() const;
 
diff --git a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.h b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.h
index 6eb0627..4c64e85 100644
--- a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.h
+++ b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.h
@@ -48,7 +48,7 @@ class QAxWidgetTaskMenu: public QObject, public QDesignerTaskMenuExtension
 public:
     explicit QAxWidgetTaskMenu(QDesignerAxWidget *object, QObject *parent = 0);
     virtual ~QAxWidgetTaskMenu();
-    virtual QList<QAction*> taskActions() const;
+    QList<QAction*> taskActions() const Q_DECL_OVERRIDE;
 
 private slots:
     void setActiveXControl();
diff --git a/src/designer/src/plugins/activeqt/qdesigneraxwidget.h b/src/designer/src/plugins/activeqt/qdesigneraxwidget.h
index 0fbb970..0461300 100644
--- a/src/designer/src/plugins/activeqt/qdesigneraxwidget.h
+++ b/src/designer/src/plugins/activeqt/qdesigneraxwidget.h
@@ -102,8 +102,8 @@ public:
     explicit QDesignerAxPluginWidget(QWidget *parent);
     virtual ~QDesignerAxPluginWidget();
 
-    virtual const QMetaObject *metaObject() const;
-    virtual int qt_metacall(QMetaObject::Call, int, void **);
+    const QMetaObject *metaObject() const Q_DECL_OVERRIDE;
+    int qt_metacall(QMetaObject::Call, int, void **) Q_DECL_OVERRIDE;
 
 private:
     QMap<int, bool> m_propValues;
diff --git a/src/designer/src/plugins/qwebview/qwebview_plugin.h b/src/designer/src/plugins/qwebview/qwebview_plugin.h
index c402c66..f02b35f 100644
--- a/src/designer/src/plugins/qwebview/qwebview_plugin.h
+++ b/src/designer/src/plugins/qwebview/qwebview_plugin.h
@@ -46,17 +46,17 @@ class QWebViewPlugin: public QObject, public QDesignerCustomWidgetInterface
 public:
     QWebViewPlugin(QObject *parent = 0);
 
-    virtual QString name() const;
-    virtual QString group() const;
-    virtual QString toolTip() const;
-    virtual QString whatsThis() const;
-    virtual QString includeFile() const;
-    virtual QIcon icon() const;
-    virtual bool isContainer() const;
-    virtual QWidget *createWidget(QWidget *parent);
-    virtual bool isInitialized() const;
-    virtual void initialize(QDesignerFormEditorInterface *core);
-    virtual QString domXml() const;
+    QString name() const Q_DECL_OVERRIDE;
+    QString group() const Q_DECL_OVERRIDE;
+    QString toolTip() const Q_DECL_OVERRIDE;
+    QString whatsThis() const Q_DECL_OVERRIDE;
+    QString includeFile() const Q_DECL_OVERRIDE;
+    QIcon icon() const Q_DECL_OVERRIDE;
+    bool isContainer() const Q_DECL_OVERRIDE;
+    QWidget *createWidget(QWidget *parent) Q_DECL_OVERRIDE;
+    bool isInitialized() const Q_DECL_OVERRIDE;
+    void initialize(QDesignerFormEditorInterface *core) Q_DECL_OVERRIDE;
+    QString domXml() const Q_DECL_OVERRIDE;
 
 private:
     bool m_initialized;
diff --git a/src/designer/src/plugins/tools/view3d/view3d.cpp b/src/designer/src/plugins/tools/view3d/view3d.cpp
index 5a58afc..ba0fd34 100644
--- a/src/designer/src/plugins/tools/view3d/view3d.cpp
+++ b/src/designer/src/plugins/tools/view3d/view3d.cpp
@@ -57,7 +57,7 @@ class QView3DWidget : public QGLWidget
 public:
     QView3DWidget(QWidget *parent);
     virtual void initializeGL();
-    virtual void resizeGL(int w, int h);
+    void resizeGL(int w, int h) Q_DECL_OVERRIDE;
     virtual void paintGL();
     void clear();
 
diff --git a/src/designer/src/plugins/tools/view3d/view3d_plugin.h b/src/designer/src/plugins/tools/view3d/view3d_plugin.h
index fa2bf02..72a0d33 100644
--- a/src/designer/src/plugins/tools/view3d/view3d_plugin.h
+++ b/src/designer/src/plugins/tools/view3d/view3d_plugin.h
@@ -55,10 +55,10 @@ class VIEW3D_EXPORT QView3DPlugin : public QObject, public QDesignerFormEditorPl
 
 public:
     QView3DPlugin();
-    virtual bool isInitialized() const;
-    virtual void initialize(QDesignerFormEditorInterface *core);
-    virtual QAction *action() const;
-    virtual QDesignerFormEditorInterface *core() const;
+    bool isInitialized() const Q_DECL_OVERRIDE;
+    void initialize(QDesignerFormEditorInterface *core) Q_DECL_OVERRIDE;
+    QAction *action() const Q_DECL_OVERRIDE;
+    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
 
 public slots:
     void activeFormWindowChanged(QDesignerFormWindowInterface *formWindow);
diff --git a/src/designer/src/plugins/tools/view3d/view3d_tool.h b/src/designer/src/plugins/tools/view3d/view3d_tool.h
index 4817169..0abe659 100644
--- a/src/designer/src/plugins/tools/view3d/view3d_tool.h
+++ b/src/designer/src/plugins/tools/view3d/view3d_tool.h
@@ -48,16 +48,16 @@ class VIEW3D_EXPORT QView3DTool : public QDesignerFormWindowToolInterface
 
 public:
     explicit QView3DTool(QDesignerFormWindowInterface *formWindow, QObject *parent = 0);
-    virtual QDesignerFormEditorInterface *core() const;
-    virtual QDesignerFormWindowInterface *formWindow() const;
-    virtual QWidget *editor() const;
+    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
+    QDesignerFormWindowInterface *formWindow() const Q_DECL_OVERRIDE;
+    QWidget *editor() const Q_DECL_OVERRIDE;
 
-    virtual QAction *action() const;
+    QAction *action() const Q_DECL_OVERRIDE;
 
     virtual void activated();
     virtual void deactivated();
 
-    virtual bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event);
+    bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event) Q_DECL_OVERRIDE;
 
 private:
     QDesignerFormWindowInterface *m_formWindow;
diff --git a/src/designer/src/uitools/quiloader.cpp b/src/designer/src/uitools/quiloader.cpp
index a225744..dbf8918 100644
--- a/src/designer/src/uitools/quiloader.cpp
+++ b/src/designer/src/uitools/quiloader.cpp
@@ -95,9 +95,9 @@ public:
     TranslatingTextBuilder(bool trEnabled, const QByteArray &className) :
         m_trEnabled(trEnabled), m_className(className) {}
 
-    virtual QVariant loadText(const DomProperty *icon) const;
+    QVariant loadText(const DomProperty *icon) const Q_DECL_OVERRIDE;
 
-    virtual QVariant toNativeValue(const QVariant &value) const;
+    QVariant toNativeValue(const QVariant &value) const Q_DECL_OVERRIDE;
 
 private:
     bool m_trEnabled;
@@ -379,10 +379,10 @@ public:
         return 0;
     }
 
-    virtual void applyProperties(QObject *o, const QList<DomProperty*> &properties);
-    virtual QWidget *create(DomUI *ui, QWidget *parentWidget);
-    virtual QWidget *create(DomWidget *ui_widget, QWidget *parentWidget);
-    virtual bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget);
+    void applyProperties(QObject *o, const QList<DomProperty*> &properties) Q_DECL_OVERRIDE;
+    QWidget *create(DomUI *ui, QWidget *parentWidget) Q_DECL_OVERRIDE;
+    QWidget *create(DomWidget *ui_widget, QWidget *parentWidget) Q_DECL_OVERRIDE;
+    bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) Q_DECL_OVERRIDE;
 
 private:
     QByteArray m_class;