Replace Q_DECL_OVERRIDE with override

Change-Id: I1b8b338a6bc2f3c87af62c20ff1428096b309628
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

21 files changed, 237 insertions, 237 deletions

diff --git a/src/designer/src/components/formeditor/default_actionprovider.h b/src/designer/src/components/formeditor/default_actionprovider.h
index 8eb4f3d60..f8ef9421d 100644
--- a/src/designer/src/components/formeditor/default_actionprovider.h
+++ b/src/designer/src/components/formeditor/default_actionprovider.h
@@ -49,7 +49,7 @@ protected:
     explicit ActionProviderBase(QWidget *widget);
 
 public:
-    void adjustIndicator(const QPoint &pos) Q_DECL_OVERRIDE;
+    void adjustIndicator(const QPoint &pos) override;
     virtual Qt::Orientation orientation() const = 0;
 
 protected:
@@ -66,12 +66,12 @@ class QT_FORMEDITOR_EXPORT QToolBarActionProvider: public QObject, public Action
 public:
     explicit QToolBarActionProvider(QToolBar *widget, QObject *parent = 0);
 
-    QRect actionGeometry(QAction *action) const Q_DECL_OVERRIDE;
-    QAction *actionAt(const QPoint &pos) const Q_DECL_OVERRIDE;
-    Qt::Orientation orientation() const Q_DECL_OVERRIDE;
+    QRect actionGeometry(QAction *action) const override;
+    QAction *actionAt(const QPoint &pos) const override;
+    Qt::Orientation orientation() const override;
 
 protected:
-    QRect indicatorGeometry(const QPoint &pos, Qt::LayoutDirection layoutDirection) const Q_DECL_OVERRIDE;
+    QRect indicatorGeometry(const QPoint &pos, Qt::LayoutDirection layoutDirection) const override;
 
 private:
     QToolBar *m_widget;
@@ -84,9 +84,9 @@ class QT_FORMEDITOR_EXPORT QMenuBarActionProvider: public QObject, public Action
 public:
     explicit QMenuBarActionProvider(QMenuBar *widget, QObject *parent = 0);
 
-    QRect actionGeometry(QAction *action) const Q_DECL_OVERRIDE;
-    QAction *actionAt(const QPoint &pos) const Q_DECL_OVERRIDE;
-    Qt::Orientation orientation() const Q_DECL_OVERRIDE;
+    QRect actionGeometry(QAction *action) const override;
+    QAction *actionAt(const QPoint &pos) const override;
+    Qt::Orientation orientation() const override;
 
 private:
     QMenuBar *m_widget;
@@ -99,9 +99,9 @@ class QT_FORMEDITOR_EXPORT QMenuActionProvider: public QObject, public ActionPro
 public:
     explicit QMenuActionProvider(QMenu *widget, QObject *parent = 0);
 
-    QRect actionGeometry(QAction *action) const Q_DECL_OVERRIDE;
-    QAction *actionAt(const QPoint &pos) const Q_DECL_OVERRIDE;
-    Qt::Orientation orientation() const Q_DECL_OVERRIDE;
+    QRect actionGeometry(QAction *action) const override;
+    QAction *actionAt(const QPoint &pos) const override;
+    Qt::Orientation orientation() const override;
 
 private:
     QMenu *m_widget;
diff --git a/src/designer/src/components/formeditor/default_container.h b/src/designer/src/components/formeditor/default_container.h
index 772c166ee..c0af7ded1 100644
--- a/src/designer/src/components/formeditor/default_container.h
+++ b/src/designer/src/components/formeditor/default_container.h
@@ -51,15 +51,15 @@ class QStackedWidgetContainer: public QObject, public QDesignerContainerExtensio
 public:
     explicit QStackedWidgetContainer(QStackedWidget *widget, QObject *parent = 0);
 
-    int count() const Q_DECL_OVERRIDE { return m_widget->count(); }
-    QWidget *widget(int index) const Q_DECL_OVERRIDE { return m_widget->widget(index); }
+    int count() const override { return m_widget->count(); }
+    QWidget *widget(int index) const override { return m_widget->widget(index); }
 
-    int currentIndex() const Q_DECL_OVERRIDE { return m_widget->currentIndex(); }
-    void setCurrentIndex(int index) Q_DECL_OVERRIDE;
+    int currentIndex() const override { return m_widget->currentIndex(); }
+    void setCurrentIndex(int index) override;
 
-    void addWidget(QWidget *widget) Q_DECL_OVERRIDE;
-    void insertWidget(int index, QWidget *widget) Q_DECL_OVERRIDE;
-    void remove(int index) Q_DECL_OVERRIDE;
+    void addWidget(QWidget *widget) override;
+    void insertWidget(int index, QWidget *widget) override;
+    void remove(int index) override;
 
 private:
     QStackedWidget *m_widget;
@@ -73,15 +73,15 @@ class QTabWidgetContainer: public QObject, public QDesignerContainerExtension
 public:
     explicit QTabWidgetContainer(QTabWidget *widget, QObject *parent = 0);
 
-    int count() const Q_DECL_OVERRIDE { return m_widget->count(); }
-    QWidget *widget(int index) const Q_DECL_OVERRIDE { return m_widget->widget(index); }
+    int count() const override { return m_widget->count(); }
+    QWidget *widget(int index) const override { return m_widget->widget(index); }
 
-    int currentIndex() const Q_DECL_OVERRIDE { return m_widget->currentIndex(); }
-    void setCurrentIndex(int index) Q_DECL_OVERRIDE;
+    int currentIndex() const override { return m_widget->currentIndex(); }
+    void setCurrentIndex(int index) override;
 
-    void addWidget(QWidget *widget) Q_DECL_OVERRIDE;
-    void insertWidget(int index, QWidget *widget) Q_DECL_OVERRIDE;
-    void remove(int index) Q_DECL_OVERRIDE;
+    void addWidget(QWidget *widget) override;
+    void insertWidget(int index, QWidget *widget) override;
+    void remove(int index) override;
 
 private:
     QTabWidget *m_widget;
@@ -95,15 +95,15 @@ class QToolBoxContainer: public QObject, public QDesignerContainerExtension
 public:
     explicit QToolBoxContainer(QToolBox *widget, QObject *parent = 0);
 
-    int count() const Q_DECL_OVERRIDE { return m_widget->count(); }
-    QWidget *widget(int index) const Q_DECL_OVERRIDE { return m_widget->widget(index); }
+    int count() const override { return m_widget->count(); }
+    QWidget *widget(int index) const override { return m_widget->widget(index); }
 
-    int currentIndex() const Q_DECL_OVERRIDE { return m_widget->currentIndex(); }
-    void setCurrentIndex(int index) Q_DECL_OVERRIDE;
+    int currentIndex() const override { return m_widget->currentIndex(); }
+    void setCurrentIndex(int index) override;
 
-    void addWidget(QWidget *widget) Q_DECL_OVERRIDE;
-    void insertWidget(int index, QWidget *widget) Q_DECL_OVERRIDE;
-    void remove(int index) Q_DECL_OVERRIDE;
+    void addWidget(QWidget *widget) override;
+    void insertWidget(int index, QWidget *widget) override;
+    void remove(int index) override;
 
 private:
     QToolBox *m_widget;
@@ -118,16 +118,16 @@ class SingleChildContainer: public QDesignerContainerExtension
 protected:
     explicit SingleChildContainer(Container *widget, bool active = true);
 public:
-    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 {}
-
-    bool canAddWidget() const Q_DECL_OVERRIDE { return false; }
-    bool canRemove(int) const Q_DECL_OVERRIDE { return false; }
+    int count() const override;
+    QWidget *widget(int index) const override;
+    int currentIndex() const override;
+    void setCurrentIndex(int /*index*/) override {}
+    void addWidget(QWidget *widget) override;
+    void insertWidget(int index, QWidget *widget) override;
+    void remove(int /*index*/) override {}
+
+    bool canAddWidget() const override { return false; }
+    bool canRemove(int) const override { return false; }
 
 private:
     const bool m_active;
diff --git a/src/designer/src/components/formeditor/default_layoutdecoration.h b/src/designer/src/components/formeditor/default_layoutdecoration.h
index 3fcf7590d..674056578 100644
--- a/src/designer/src/components/formeditor/default_layoutdecoration.h
+++ b/src/designer/src/components/formeditor/default_layoutdecoration.h
@@ -46,7 +46,7 @@ public:
     explicit QDesignerLayoutDecorationFactory(QExtensionManager *parent = 0);
 
 protected:
-    QObject *createExtension(QObject *object, const QString &iid, QObject *parent) const Q_DECL_OVERRIDE;
+    QObject *createExtension(QObject *object, const QString &iid, QObject *parent) const override;
 };
 
 }  // namespace qdesigner_internal
diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp
index 15b88f0a4..b03be6c82 100644
--- a/src/designer/src/components/formeditor/formwindow.cpp
+++ b/src/designer/src/components/formeditor/formwindow.cpp
@@ -1472,7 +1472,7 @@ public:
                        QDesignerPropertySheetExtension *s, int i) :
                        PropertyHelper(o, sp, s, i) {}
 
-    Value setValue(QDesignerFormWindowInterface *fw, const QVariant &value, bool changed, unsigned subPropertyMask) Q_DECL_OVERRIDE;
+    Value setValue(QDesignerFormWindowInterface *fw, const QVariant &value, bool changed, unsigned subPropertyMask) override;
 };
 
 PropertyHelper::Value ArrowKeyPropertyHelper::setValue(QDesignerFormWindowInterface *fw, const QVariant &value, bool changed, unsigned subPropertyMask)
@@ -1496,9 +1496,9 @@ public:
 
 protected:
     PropertyHelper *createPropertyHelper(QObject *o, SpecialProperty sp,
-                                         QDesignerPropertySheetExtension *s, int i) const Q_DECL_OVERRIDE
+                                         QDesignerPropertySheetExtension *s, int i) const override
         { return new ArrowKeyPropertyHelper(o, sp, s, i); }
-    QVariant mergeValue(const QVariant &newValue) Q_DECL_OVERRIDE;
+    QVariant mergeValue(const QVariant &newValue) override;
 };
 
 ArrowKeyPropertyCommand::ArrowKeyPropertyCommand(QDesignerFormWindowInterface *fw,
diff --git a/src/designer/src/components/formeditor/formwindow.h b/src/designer/src/components/formeditor/formwindow.h
index aca354728..d535134bd 100644
--- a/src/designer/src/components/formeditor/formwindow.h
+++ b/src/designer/src/components/formeditor/formwindow.h
@@ -80,55 +80,55 @@ public:
     explicit FormWindow(FormEditor *core, QWidget *parent = 0, Qt::WindowFlags flags = 0);
     virtual ~FormWindow();
 
-    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
+    QDesignerFormEditorInterface *core() const override;
 
-    QDesignerFormWindowCursorInterface *cursor() const Q_DECL_OVERRIDE;
+    QDesignerFormWindowCursorInterface *cursor() const override;
 
     // Overwritten: FormWindowBase
-    QWidget *formContainer() const Q_DECL_OVERRIDE;
+    QWidget *formContainer() const override;
 
-    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;
+    int toolCount() const override;
+    int currentTool() const override;
+    void setCurrentTool(int index) override;
+    QDesignerFormWindowToolInterface *tool(int index) const override;
+    void registerTool(QDesignerFormWindowToolInterface *tool) override;
 
-    QString author() const Q_DECL_OVERRIDE;
-    void setAuthor(const QString &author) Q_DECL_OVERRIDE;
+    QString author() const override;
+    void setAuthor(const QString &author) override;
 
-    QString comment() const Q_DECL_OVERRIDE;
-    void setComment(const QString &comment) Q_DECL_OVERRIDE;
+    QString comment() const override;
+    void setComment(const QString &comment) override;
 
-    void layoutDefault(int *margin, int *spacing) Q_DECL_OVERRIDE;
-    void setLayoutDefault(int margin, int spacing) Q_DECL_OVERRIDE;
+    void layoutDefault(int *margin, int *spacing) override;
+    void setLayoutDefault(int margin, int spacing) override;
 
-    void layoutFunction(QString *margin, QString *spacing) Q_DECL_OVERRIDE;
-    void setLayoutFunction(const QString &margin, const QString &spacing) Q_DECL_OVERRIDE;
+    void layoutFunction(QString *margin, QString *spacing) override;
+    void setLayoutFunction(const QString &margin, const QString &spacing) override;
 
-    QString pixmapFunction() const Q_DECL_OVERRIDE;
-    void setPixmapFunction(const QString &pixmapFunction) Q_DECL_OVERRIDE;
+    QString pixmapFunction() const override;
+    void setPixmapFunction(const QString &pixmapFunction) override;
 
-    QString exportMacro() const Q_DECL_OVERRIDE;
-    void setExportMacro(const QString &exportMacro) Q_DECL_OVERRIDE;
+    QString exportMacro() const override;
+    void setExportMacro(const QString &exportMacro) override;
 
-    QStringList includeHints() const Q_DECL_OVERRIDE;
-    void setIncludeHints(const QStringList &includeHints) Q_DECL_OVERRIDE;
+    QStringList includeHints() const override;
+    void setIncludeHints(const QStringList &includeHints) override;
 
-    QString fileName() const Q_DECL_OVERRIDE;
-    void setFileName(const QString &fileName) Q_DECL_OVERRIDE;
+    QString fileName() const override;
+    void setFileName(const QString &fileName) override;
 
-    QString contents() const Q_DECL_OVERRIDE;
-    bool setContents(QIODevice *dev, QString *errorMessage = 0) Q_DECL_OVERRIDE;
-    bool setContents(const QString &) Q_DECL_OVERRIDE;
+    QString contents() const override;
+    bool setContents(QIODevice *dev, QString *errorMessage = 0) override;
+    bool setContents(const QString &) override;
 
-    QDir absoluteDir() const Q_DECL_OVERRIDE;
+    QDir absoluteDir() const override;
 
-    void simplifySelection(QWidgetList *sel) const Q_DECL_OVERRIDE;
+    void simplifySelection(QWidgetList *sel) const override;
 
-    void ensureUniqueObjectName(QObject *object) Q_DECL_OVERRIDE;
+    void ensureUniqueObjectName(QObject *object) override;
 
-    QWidget *mainContainer() const Q_DECL_OVERRIDE;
-    void setMainContainer(QWidget *mainContainer) Q_DECL_OVERRIDE;
+    QWidget *mainContainer() const override;
+    void setMainContainer(QWidget *mainContainer) override;
     bool isMainContainer(const QWidget *w) const;
 
     QWidget *currentWidget() const;
@@ -136,9 +136,9 @@ public:
     bool hasInsertedChildren(QWidget *w) const;
 
     QWidgetList selectedWidgets() const;
-    void clearSelection(bool changePropertyDisplay = true) Q_DECL_OVERRIDE;
+    void clearSelection(bool changePropertyDisplay = true) override;
     bool isWidgetSelected(QWidget *w) const;
-    void selectWidget(QWidget *w, bool select = true) Q_DECL_OVERRIDE;
+    void selectWidget(QWidget *w, bool select = true) override;
 
     void selectWidgets();
     void repaintSelection();
@@ -155,56 +155,56 @@ public:
 
     QWidget *createWidget(DomUI *ui, const QRect &rect, QWidget *target);
 
-    bool isManaged(QWidget *w) const Q_DECL_OVERRIDE;
+    bool isManaged(QWidget *w) const override;
 
-    void manageWidget(QWidget *w) Q_DECL_OVERRIDE;
-    void unmanageWidget(QWidget *w) Q_DECL_OVERRIDE;
+    void manageWidget(QWidget *w) override;
+    void unmanageWidget(QWidget *w) override;
 
-    QUndoStack *commandHistory() const Q_DECL_OVERRIDE;
-    void beginCommand(const QString &description) Q_DECL_OVERRIDE;
-    void endCommand() Q_DECL_OVERRIDE;
+    QUndoStack *commandHistory() const override;
+    void beginCommand(const QString &description) override;
+    void endCommand() override;
 
-    bool blockSelectionChanged(bool blocked) Q_DECL_OVERRIDE;
-    void emitSelectionChanged() Q_DECL_OVERRIDE;
+    bool blockSelectionChanged(bool blocked) override;
+    void emitSelectionChanged() override;
 
     bool unify(QObject *w, QString &s, bool changeIt);
 
-    bool isDirty() const Q_DECL_OVERRIDE;
-    void setDirty(bool dirty) Q_DECL_OVERRIDE;
+    bool isDirty() const override;
+    void setDirty(bool dirty) override;
 
     static FormWindow *findFormWindow(QWidget *w);
 
     virtual QWidget *containerAt(const QPoint &pos);
-    QWidget *widgetAt(const QPoint &pos) Q_DECL_OVERRIDE;
-    void highlightWidget(QWidget *w, const QPoint &pos, HighlightMode mode = Highlight) Q_DECL_OVERRIDE;
+    QWidget *widgetAt(const QPoint &pos) override;
+    void highlightWidget(QWidget *w, const QPoint &pos, HighlightMode mode = Highlight) override;
 
     void updateOrderIndicators();
 
     bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event);
 
-    QStringList resourceFiles() const Q_DECL_OVERRIDE;
-    void addResourceFile(const QString &path) Q_DECL_OVERRIDE;
-    void removeResourceFile(const QString &path) Q_DECL_OVERRIDE;
+    QStringList resourceFiles() const override;
+    void addResourceFile(const QString &path) override;
+    void removeResourceFile(const QString &path) override;
 
     void resizeWidget(QWidget *widget, const QRect &geometry);
 
     bool dropDockWidget(QDesignerDnDItemInterface *item, const QPoint &global_mouse_pos);
     bool dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, QWidget *target,
-                     const QPoint &global_mouse_pos) Q_DECL_OVERRIDE;
+                     const QPoint &global_mouse_pos) override;
 
-    QWidget *findContainer(QWidget *w, bool excludeLayout) const Q_DECL_OVERRIDE;
+    QWidget *findContainer(QWidget *w, bool excludeLayout) const override;
     // for WidgetSelection only.
     QWidget *designerWidget(QWidget *w) const;
 
     //  Initialize and return a popup menu for a managed widget
-    QMenu *initializePopupMenu(QWidget *managedWidget) Q_DECL_OVERRIDE;
+    QMenu *initializePopupMenu(QWidget *managedWidget) override;
 
 #ifndef QT_NO_CLIPBOARD
-    void paste(PasteMode pasteMode) Q_DECL_OVERRIDE;
+    void paste(PasteMode pasteMode) override;
 #endif
-    virtual QEditorFormBuilder *createFormBuilder() Q_DECL_OVERRIDE;
+    QEditorFormBuilder *createFormBuilder() override;
 
-    bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE;
+    bool eventFilter(QObject *watched, QEvent *event) override;
 
     HandleOperation handleOperation() const { return m_handleOperation; }
     void setHandleOperation(HandleOperation o) { m_handleOperation = o; }
@@ -231,7 +231,7 @@ public slots:
 
 protected:
     virtual QMenu *createPopupMenu(QWidget *w);
-    void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE;
+    void resizeEvent(QResizeEvent *e) override;
 
     void insertWidget(QWidget *w, const QRect &rect, QWidget *target, bool already_in_form = false);
 
@@ -303,7 +303,7 @@ private:
     static int widgetDepth(const QWidget *w);
     static bool isChildOf(const QWidget *c, const QWidget *p);
 
-    void editWidgets() Q_DECL_OVERRIDE;
+    void editWidgets() override;
 
     void updateWidgets();
 
diff --git a/src/designer/src/components/formeditor/formwindow_dnditem.h b/src/designer/src/components/formeditor/formwindow_dnditem.h
index aac9e5f6a..9ff1b0fb9 100644
--- a/src/designer/src/components/formeditor/formwindow_dnditem.h
+++ b/src/designer/src/components/formeditor/formwindow_dnditem.h
@@ -42,7 +42,7 @@ class FormWindowDnDItem : public QDesignerDnDItem
 public:
     FormWindowDnDItem(QDesignerDnDItemInterface::DropType type, FormWindow *form,
                         QWidget *widget, const QPoint &global_mouse_pos);
-    DomUI *domUi() const Q_DECL_OVERRIDE;
+    DomUI *domUi() const override;
 };
 
 }  // namespace qdesigner_internal
diff --git a/src/designer/src/components/formeditor/formwindowcursor.h b/src/designer/src/components/formeditor/formwindowcursor.h
index 17e33e1b1..b2045c779 100644
--- a/src/designer/src/components/formeditor/formwindowcursor.h
+++ b/src/designer/src/components/formeditor/formwindowcursor.h
@@ -46,25 +46,25 @@ public:
     explicit FormWindowCursor(FormWindow *fw, QObject *parent = 0);
     virtual ~FormWindowCursor();
 
-    QDesignerFormWindowInterface *formWindow() const Q_DECL_OVERRIDE;
+    QDesignerFormWindowInterface *formWindow() const override;
 
-    bool movePosition(MoveOperation op, MoveMode mode) Q_DECL_OVERRIDE;
+    bool movePosition(MoveOperation op, MoveMode mode) override;
 
-    int position() const Q_DECL_OVERRIDE;
-    void setPosition(int pos, MoveMode mode) Q_DECL_OVERRIDE;
+    int position() const override;
+    void setPosition(int pos, MoveMode mode) override;
 
-    QWidget *current() const Q_DECL_OVERRIDE;
+    QWidget *current() const override;
 
-    int widgetCount() const Q_DECL_OVERRIDE;
-    QWidget *widget(int index) const Q_DECL_OVERRIDE;
+    int widgetCount() const override;
+    QWidget *widget(int index) const override;
 
-    bool hasSelection() const Q_DECL_OVERRIDE;
-    int selectedWidgetCount() const Q_DECL_OVERRIDE;
-    QWidget *selectedWidget(int index) const Q_DECL_OVERRIDE;
+    bool hasSelection() const override;
+    int selectedWidgetCount() const override;
+    QWidget *selectedWidget(int index) const override;
 
-    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;
+    void setProperty(const QString &name, const QVariant &value) override;
+    void setWidgetProperty(QWidget *widget, const QString &name, const QVariant &value) override;
+    void resetWidgetProperty(QWidget *widget, const QString &name) override;
 
 public slots:
     void update();
diff --git a/src/designer/src/components/formeditor/formwindowmanager.h b/src/designer/src/components/formeditor/formwindowmanager.h
index 89841dc7a..ffd708b0d 100644
--- a/src/designer/src/components/formeditor/formwindowmanager.h
+++ b/src/designer/src/components/formeditor/formwindowmanager.h
@@ -60,33 +60,33 @@ public:
     explicit FormWindowManager(QDesignerFormEditorInterface *core, QObject *parent = 0);
     virtual ~FormWindowManager();
 
-    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
+    QDesignerFormEditorInterface *core() const override;
 
-    QAction *action(Action action) const Q_DECL_OVERRIDE;
-    QActionGroup *actionGroup(ActionGroup actionGroup) const Q_DECL_OVERRIDE;
+    QAction *action(Action action) const override;
+    QActionGroup *actionGroup(ActionGroup actionGroup) const override;
 
-    QDesignerFormWindowInterface *activeFormWindow() const Q_DECL_OVERRIDE;
+    QDesignerFormWindowInterface *activeFormWindow() const override;
 
-    int formWindowCount() const Q_DECL_OVERRIDE;
-    QDesignerFormWindowInterface *formWindow(int index) const Q_DECL_OVERRIDE;
+    int formWindowCount() const override;
+    QDesignerFormWindowInterface *formWindow(int index) const override;
 
-    QDesignerFormWindowInterface *createFormWindow(QWidget *parentWidget = 0, Qt::WindowFlags flags = 0) Q_DECL_OVERRIDE;
+    QDesignerFormWindowInterface *createFormWindow(QWidget *parentWidget = 0, Qt::WindowFlags flags = 0) override;
 
-    QPixmap createPreviewPixmap() const Q_DECL_OVERRIDE;
+    QPixmap createPreviewPixmap() const override;
 
-    bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE;
+    bool eventFilter(QObject *o, QEvent *e) override;
 
-    void dragItems(const QList<QDesignerDnDItemInterface*> &item_list) Q_DECL_OVERRIDE;
+    void dragItems(const QList<QDesignerDnDItemInterface*> &item_list) override;
 
     QUndoGroup *undoGroup() const;
 
-    PreviewManager *previewManager() const Q_DECL_OVERRIDE { return m_previewManager; }
+    PreviewManager *previewManager() const override { return m_previewManager; }
 
 public slots:
-    void addFormWindow(QDesignerFormWindowInterface *formWindow) Q_DECL_OVERRIDE;
-    void removeFormWindow(QDesignerFormWindowInterface *formWindow) Q_DECL_OVERRIDE;
-    void setActiveFormWindow(QDesignerFormWindowInterface *formWindow) Q_DECL_OVERRIDE;
-    void closeAllPreviews() Q_DECL_OVERRIDE;
+    void addFormWindow(QDesignerFormWindowInterface *formWindow) override;
+    void removeFormWindow(QDesignerFormWindowInterface *formWindow) override;
+    void setActiveFormWindow(QDesignerFormWindowInterface *formWindow) override;
+    void closeAllPreviews() override;
     void deviceProfilesChanged();
 
 private slots:
@@ -103,7 +103,7 @@ private slots:
     void slotActionBreakLayoutActivated();
     void slotActionAdjustSizeActivated();
     void slotActionSimplifyLayoutActivated();
-    void showPreview() Q_DECL_OVERRIDE;
+    void showPreview() override;
     void slotActionGroupPreviewInStyle(const QString &style, int deviceProfileIndex);
     void slotActionShowFormWindowSettingsDialog();
 
diff --git a/src/designer/src/components/formeditor/itemview_propertysheet.h b/src/designer/src/components/formeditor/itemview_propertysheet.h
index a65fe68ab..64492341a 100644
--- a/src/designer/src/components/formeditor/itemview_propertysheet.h
+++ b/src/designer/src/components/formeditor/itemview_propertysheet.h
@@ -53,14 +53,14 @@ public:
     QHash<QString,QString> propertyNameMap() const;
 
     // QDesignerPropertySheet
-    QVariant property(int index) const Q_DECL_OVERRIDE;
-    void setProperty(int index, const QVariant &value) Q_DECL_OVERRIDE;
+    QVariant property(int index) const override;
+    void setProperty(int index, const QVariant &value) override;
 
-    void setChanged(int index, bool changed) Q_DECL_OVERRIDE;
-    bool isChanged(int index) const Q_DECL_OVERRIDE;
+    void setChanged(int index, bool changed) override;
+    bool isChanged(int index) const override;
 
-    bool hasReset(int index) const Q_DECL_OVERRIDE;
-    bool reset(int index) Q_DECL_OVERRIDE;
+    bool hasReset(int index) const override;
+    bool reset(int index) 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 0609fbb2f..788cf2edf 100644
--- a/src/designer/src/components/formeditor/layout_propertysheet.h
+++ b/src/designer/src/components/formeditor/layout_propertysheet.h
@@ -49,10 +49,10 @@ public:
     explicit LayoutPropertySheet(QLayout *object, QObject *parent = 0);
     virtual ~LayoutPropertySheet();
 
-    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) Q_DECL_OVERRIDE;
+    void setProperty(int index, const QVariant &value) override;
+    QVariant property(int index) const override;
+    bool reset(int index) override;
+    void setChanged(int index, bool changed) override;
 
     static void stretchAttributesToDom(QDesignerFormEditorInterface *core, QLayout *lt, DomLayout *domLayout);
     static void markChangedStretchProperties(QDesignerFormEditorInterface *core, QLayout *lt, const DomLayout *domLayout);
diff --git a/src/designer/src/components/formeditor/line_propertysheet.h b/src/designer/src/components/formeditor/line_propertysheet.h
index 7df6f20c6..f5ff443ed 100644
--- a/src/designer/src/components/formeditor/line_propertysheet.h
+++ b/src/designer/src/components/formeditor/line_propertysheet.h
@@ -45,9 +45,9 @@ public:
     explicit LinePropertySheet(Line *object, QObject *parent = 0);
     virtual ~LinePropertySheet();
 
-    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;
+    void setProperty(int index, const QVariant &value) override;
+    bool isVisible(int index) const override;
+    QString propertyGroup(int index) const 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 c2a6c250a..4da1e7b4c 100644
--- a/src/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -133,13 +133,13 @@ public:
     QStringList loadedQrcFiles() const                    { return m_loadedQrcFiles.keys(); } // needed only for loading old resource attribute of <iconset> tag.
 #endif
 
-    QVariant loadResource(const QDir &workingDirectory, const DomProperty *icon) const Q_DECL_OVERRIDE;
+    QVariant loadResource(const QDir &workingDirectory, const DomProperty *icon) const override;
 
-    QVariant toNativeValue(const QVariant &value) const Q_DECL_OVERRIDE;
+    QVariant toNativeValue(const QVariant &value) const override;
 
-    DomProperty *saveResource(const QDir &workingDirectory, const QVariant &value) const Q_DECL_OVERRIDE;
+    DomProperty *saveResource(const QDir &workingDirectory, const QVariant &value) const override;
 
-    bool isResourceType(const QVariant &value) const Q_DECL_OVERRIDE;
+    bool isResourceType(const QVariant &value) const override;
 private:
 
     QDesignerFormEditorInterface *m_core;
@@ -361,11 +361,11 @@ class QDesignerTextBuilder : public QTextBuilder
 public:
     QDesignerTextBuilder() {}
 
-    QVariant loadText(const DomProperty *icon) const Q_DECL_OVERRIDE;
+    QVariant loadText(const DomProperty *icon) const override;
 
-    QVariant toNativeValue(const QVariant &value) const Q_DECL_OVERRIDE;
+    QVariant toNativeValue(const QVariant &value) const override;
 
-    DomProperty *saveText(const QVariant &value) const Q_DECL_OVERRIDE;
+    DomProperty *saveText(const QVariant &value) const 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 746943928..f444f6334 100644
--- a/src/designer/src/components/formeditor/qdesigner_resource.h
+++ b/src/designer/src/components/formeditor/qdesigner_resource.h
@@ -65,57 +65,57 @@ public:
     explicit QDesignerResource(FormWindow *fw);
     virtual ~QDesignerResource();
 
-    void save(QIODevice *dev, QWidget *widget) Q_DECL_OVERRIDE;
+    void save(QIODevice *dev, QWidget *widget) override;
 
-    bool copy(QIODevice *dev, const FormBuilderClipboard &selection) Q_DECL_OVERRIDE;
-    DomUI *copy(const FormBuilderClipboard &selection) Q_DECL_OVERRIDE;
+    bool copy(QIODevice *dev, const FormBuilderClipboard &selection) override;
+    DomUI *copy(const FormBuilderClipboard &selection) override;
 
-    FormBuilderClipboard paste(DomUI *ui, QWidget *widgetParent, QObject *actionParent = 0) Q_DECL_OVERRIDE;
-    FormBuilderClipboard paste(QIODevice *dev,  QWidget *widgetParent, QObject *actionParent = 0) Q_DECL_OVERRIDE;
+    FormBuilderClipboard paste(DomUI *ui, QWidget *widgetParent, QObject *actionParent = 0) override;
+    FormBuilderClipboard paste(QIODevice *dev,  QWidget *widgetParent, QObject *actionParent = 0) override;
 
     bool saveRelative() const;
     void setSaveRelative(bool relative);
 
-    QWidget *load(QIODevice *dev, QWidget *parentWidget) Q_DECL_OVERRIDE;
+    QWidget *load(QIODevice *dev, QWidget *parentWidget) override;
 
 protected:
     using QEditorFormBuilder::create;
     using QEditorFormBuilder::createDom;
 
-    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;
+    void saveDom(DomUI *ui, QWidget *widget) override;
+    QWidget *create(DomUI *ui, QWidget *parentWidget) override;
+    QWidget *create(DomWidget *ui_widget, QWidget *parentWidget) override;
+    QLayout *create(DomLayout *ui_layout, QLayout *layout, QWidget *parentWidget) override;
+    QLayoutItem *create(DomLayoutItem *ui_layoutItem, QLayout *layout, QWidget *parentWidget) override;
+    void applyProperties(QObject *o, const QList<DomProperty*> &properties) override;
+    QList<DomProperty*> computeProperties(QObject *obj) override;
+    DomProperty *createProperty(QObject *object, const QString &propertyName, const QVariant &value) override;
 
-    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;
+    QWidget *createWidget(const QString &widgetName, QWidget *parentWidget, const QString &name) override;
+    QLayout *createLayout(const QString &layoutName, QObject *parent, const QString &name) override;
+    void createCustomWidgets(DomCustomWidgets *) override;
+    void createResources(DomResources*) override;
+    void applyTabStops(QWidget *widget, DomTabStops *tabStops) override;
 
-    bool addItem(DomLayoutItem *ui_item, QLayoutItem *item, QLayout *layout) Q_DECL_OVERRIDE;
-    bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) Q_DECL_OVERRIDE;
+    bool addItem(DomLayoutItem *ui_item, QLayoutItem *item, QLayout *layout) override;
+    bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) override;
 
-    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;
+    DomWidget *createDom(QWidget *widget, DomWidget *ui_parentWidget, bool recursive = true) override;
+    DomLayout *createDom(QLayout *layout, DomLayout *ui_layout, DomWidget *ui_parentWidget) override;
+    DomLayoutItem *createDom(QLayoutItem *item, DomLayout *ui_layout, DomWidget *ui_parentWidget) override;
 
-    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;
+    QAction *create(DomAction *ui_action, QObject *parent) override;
+    QActionGroup *create(DomActionGroup *ui_action_group, QObject *parent) override;
+    void addMenuAction(QAction *action) override;
 
-    DomAction *createDom(QAction *action) Q_DECL_OVERRIDE;
-    DomActionGroup *createDom(QActionGroup *actionGroup) Q_DECL_OVERRIDE;
-    DomActionRef *createActionRefDom(QAction *action) Q_DECL_OVERRIDE;
+    DomAction *createDom(QAction *action) override;
+    DomActionGroup *createDom(QActionGroup *actionGroup) override;
+    DomActionRef *createActionRefDom(QAction *action) override;
 
-    QAction *createAction(QObject *parent, const QString &name) Q_DECL_OVERRIDE;
-    QActionGroup *createActionGroup(QObject *parent, const QString &name) Q_DECL_OVERRIDE;
+    QAction *createAction(QObject *parent, const QString &name) override;
+    QActionGroup *createActionGroup(QObject *parent, const QString &name) override;
 
-    bool checkProperty(QObject *obj, const QString &prop) const Q_DECL_OVERRIDE;
+    bool checkProperty(QObject *obj, const QString &prop) const override;
 
     DomWidget *saveWidget(QTabWidget *widget, DomWidget *ui_parentWidget);
     DomWidget *saveWidget(QStackedWidget *widget, DomWidget *ui_parentWidget);
@@ -125,13 +125,13 @@ protected:
     DomWidget *saveWidget(QDesignerDockWidget *dockWidget, DomWidget *ui_parentWidget);
     DomWidget *saveWidget(QWizardPage *wizardPage, DomWidget *ui_parentWidget);
 
-    DomCustomWidgets *saveCustomWidgets() Q_DECL_OVERRIDE;
-    DomTabStops *saveTabStops() Q_DECL_OVERRIDE;
-    DomResources *saveResources() Q_DECL_OVERRIDE;
+    DomCustomWidgets *saveCustomWidgets() override;
+    DomTabStops *saveTabStops() override;
+    DomResources *saveResources() override;
 
-    void layoutInfo(DomLayout *layout, QObject *parent, int *margin, int *spacing) Q_DECL_OVERRIDE;
+    void layoutInfo(DomLayout *layout, QObject *parent, int *margin, int *spacing) override;
 
-    void loadExtraInfo(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) Q_DECL_OVERRIDE;
+    void loadExtraInfo(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) 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 dba1e0f05..1bc374cf7 100644
--- a/src/designer/src/components/formeditor/qlayoutwidget_propertysheet.h
+++ b/src/designer/src/components/formeditor/qlayoutwidget_propertysheet.h
@@ -45,10 +45,10 @@ public:
     explicit QLayoutWidgetPropertySheet(QLayoutWidget *object, QObject *parent = 0);
     virtual ~QLayoutWidgetPropertySheet();
 
-    void setProperty(int index, const QVariant &value) Q_DECL_OVERRIDE;
-    bool isVisible(int index) const Q_DECL_OVERRIDE;
+    void setProperty(int index, const QVariant &value) override;
+    bool isVisible(int index) const override;
 
-    bool dynamicPropertiesAllowed() const Q_DECL_OVERRIDE;
+    bool dynamicPropertiesAllowed() const 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 b0c2d1677..d6a91e743 100644
--- a/src/designer/src/components/formeditor/qmainwindow_container.h
+++ b/src/designer/src/components/formeditor/qmainwindow_container.h
@@ -47,13 +47,13 @@ class QMainWindowContainer: public QObject, public QDesignerContainerExtension
 public:
     explicit QMainWindowContainer(QMainWindow *widget, QObject *parent = 0);
 
-    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;
+    int count() const override;
+    QWidget *widget(int index) const override;
+    int currentIndex() const override;
+    void setCurrentIndex(int index) override;
+    void addWidget(QWidget *widget) override;
+    void insertWidget(int index, QWidget *widget) override;
+    void remove(int index) 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 0dfb4489f..bc2f5814b 100644
--- a/src/designer/src/components/formeditor/qmdiarea_container.h
+++ b/src/designer/src/components/formeditor/qmdiarea_container.h
@@ -49,13 +49,13 @@ class QMdiAreaContainer: public QObject, public QDesignerContainerExtension
 public:
     explicit QMdiAreaContainer(QMdiArea *widget, QObject *parent = 0);
 
-    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;
+    int count() const override;
+    QWidget *widget(int index) const override;
+    int currentIndex() const override;
+    void setCurrentIndex(int index) override;
+    void addWidget(QWidget *widget) override;
+    void insertWidget(int index, QWidget *widget) override;
+    void remove(int index) override;
 
     // Semismart positioning of a new MDI child after cascading
     static void positionNewMdiChild(const QWidget *area, QWidget *mdiChild);
@@ -73,11 +73,11 @@ class QMdiAreaPropertySheet: public QDesignerPropertySheet
 public:
     explicit QMdiAreaPropertySheet(QWidget *mdiArea, QObject *parent = 0);
 
-    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;
+    void setProperty(int index, const QVariant &value) override;
+    bool reset(int index) override;
+    bool isEnabled(int index) const override;
+    bool isChanged(int index) const override;
+    QVariant property(int index) const 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 544093be9..6cd371486 100644
--- a/src/designer/src/components/formeditor/qwizard_container.h
+++ b/src/designer/src/components/formeditor/qwizard_container.h
@@ -53,13 +53,13 @@ class QWizardContainer: public QObject, public QDesignerContainerExtension
 public:
     explicit QWizardContainer(QWizard *widget, QObject *parent = 0);
 
-    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;
+    int count() const override;
+    QWidget *widget(int index) const override;
+    int currentIndex() const override;
+    void setCurrentIndex(int index) override;
+    void addWidget(QWidget *widget) override;
+    void insertWidget(int index, QWidget *widget) override;
+    void remove(int index) override;
 
 private:
     QWizard *m_wizard;
@@ -76,7 +76,7 @@ class QWizardPagePropertySheet: public QDesignerPropertySheet
 public:
     explicit QWizardPagePropertySheet(QWizardPage *object, QObject *parent = 0);
 
-    bool reset(int index) Q_DECL_OVERRIDE;
+    bool reset(int index) override;
 
     static const char *pageIdProperty;
 
@@ -93,7 +93,7 @@ class QWizardPropertySheet: public QDesignerPropertySheet
     Q_OBJECT
 public:
     explicit QWizardPropertySheet(QWizard *object, QObject *parent = 0);
-    bool isVisible(int index) const Q_DECL_OVERRIDE;
+    bool isVisible(int index) const 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 134d4100f..351fa1c38 100644
--- a/src/designer/src/components/formeditor/spacer_propertysheet.h
+++ b/src/designer/src/components/formeditor/spacer_propertysheet.h
@@ -45,10 +45,10 @@ public:
     explicit SpacerPropertySheet(Spacer *object, QObject *parent = 0);
     virtual ~SpacerPropertySheet();
 
-    void setProperty(int index, const QVariant &value) Q_DECL_OVERRIDE;
-    bool isVisible(int index) const Q_DECL_OVERRIDE;
+    void setProperty(int index, const QVariant &value) override;
+    bool isVisible(int index) const override;
 
-    bool dynamicPropertiesAllowed() const Q_DECL_OVERRIDE;
+    bool dynamicPropertiesAllowed() const 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 16220b9e7..65bd00e34 100644
--- a/src/designer/src/components/formeditor/templateoptionspage.h
+++ b/src/designer/src/components/formeditor/templateoptionspage.h
@@ -79,10 +79,10 @@ class TemplateOptionsPage : public QDesignerOptionsPageInterface
 public:
     explicit TemplateOptionsPage(QDesignerFormEditorInterface *core);
 
-    QString name() const Q_DECL_OVERRIDE;
-    QWidget *createPage(QWidget *parent) Q_DECL_OVERRIDE;
-    void apply() Q_DECL_OVERRIDE;
-    void finish() Q_DECL_OVERRIDE;
+    QString name() const override;
+    QWidget *createPage(QWidget *parent) override;
+    void apply() override;
+    void finish() override;
 
 private:
     QDesignerFormEditorInterface *m_core;
diff --git a/src/designer/src/components/formeditor/tool_widgeteditor.h b/src/designer/src/components/formeditor/tool_widgeteditor.h
index f892e03e3..5fe1492e1 100644
--- a/src/designer/src/components/formeditor/tool_widgeteditor.h
+++ b/src/designer/src/components/formeditor/tool_widgeteditor.h
@@ -51,15 +51,15 @@ public:
     explicit WidgetEditorTool(FormWindow *formWindow);
     virtual ~WidgetEditorTool();
 
-    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
-    QDesignerFormWindowInterface *formWindow() const Q_DECL_OVERRIDE;
-    QWidget *editor() const Q_DECL_OVERRIDE;
-    QAction *action() const Q_DECL_OVERRIDE;
+    QDesignerFormEditorInterface *core() const override;
+    QDesignerFormWindowInterface *formWindow() const override;
+    QWidget *editor() const override;
+    QAction *action() const override;
 
-    void activated() Q_DECL_OVERRIDE;
-    void deactivated() Q_DECL_OVERRIDE;
+    void activated() override;
+    void deactivated() override;
 
-    bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event) Q_DECL_OVERRIDE;
+    bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event) 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 ddd3bce39..6bf97527f 100644
--- a/src/designer/src/components/formeditor/widgetselection.h
+++ b/src/designer/src/components/formeditor/widgetselection.h
@@ -114,7 +114,7 @@ public:
 
     QDesignerFormEditorInterface *core() const;
 
-    bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE;
+    bool eventFilter(QObject *object, QEvent *event) override;
 
     enum  WidgetState { UnlaidOut, LaidOut, ManagedGridLayout, ManagedFormLayout };
     static WidgetState widgetState(const QDesignerFormEditorInterface *core, QWidget *w);