Merge remote-tracking branch 'origin/5.9' into dev

Conflicts:
	examples/examples.pro
	tests/auto/corelib/tools/qchar/tst_qchar.cpp
	tests/auto/other/qaccessibility/accessiblewidgets.h

Change-Id: I426696c40ab57d14dc295b8103152cede79f244c

1 files changed, 16 insertions, 15 deletions

diff --git a/tests/auto/other/qaccessibility/accessiblewidgets.h b/tests/auto/other/qaccessibility/accessiblewidgets.h
index 62aa38ff6c..0c337a72f4 100644
--- a/tests/auto/other/qaccessibility/accessiblewidgets.h
+++ b/tests/auto/other/qaccessibility/accessiblewidgets.h
@@ -98,14 +98,15 @@ public:
         return 0;
     }
     CustomTextWidgetIface(CustomTextWidget *w): QAccessibleWidget(w) {}
-    void *interface_cast(QAccessible::InterfaceType t)  override {
+    void *interface_cast(QAccessible::InterfaceType t) override
+    {
         if (t == QAccessible::TextInterface)
             return static_cast<QAccessibleTextInterface*>(this);
         return 0;
     }
 
     // this is mostly to test the base implementation for textBefore/At/After
-    QString text(QAccessible::Text t) const Q_DECL_OVERRIDE
+    QString text(QAccessible::Text t) const override
     {
         if (t == QAccessible::Value)
             return textWidget()->text;
@@ -131,20 +132,20 @@ public:
         return QAccessibleTextInterface::textAfterOffset(offset, boundaryType, startOffset, endOffset);
     }
 
-    void selection(int, int *startOffset, int *endOffset) const Q_DECL_OVERRIDE
+    void selection(int, int *startOffset, int *endOffset) const override
     { *startOffset = *endOffset = -1; }
-    int selectionCount() const Q_DECL_OVERRIDE { return 0; }
-    void addSelection(int, int) Q_DECL_OVERRIDE {}
-    void removeSelection(int) Q_DECL_OVERRIDE {}
-    void setSelection(int, int, int) Q_DECL_OVERRIDE {}
-    int cursorPosition() const Q_DECL_OVERRIDE { return textWidget()->cursorPosition; }
-    void setCursorPosition(int position) Q_DECL_OVERRIDE { textWidget()->cursorPosition = position; }
-    QString text(int startOffset, int endOffset) const Q_DECL_OVERRIDE { return textWidget()->text.mid(startOffset, endOffset); }
-    int characterCount() const Q_DECL_OVERRIDE { return textWidget()->text.length(); }
-    QRect characterRect(int) const Q_DECL_OVERRIDE { return QRect(); }
-    int offsetAtPoint(const QPoint &) const Q_DECL_OVERRIDE { return 0; }
-    void scrollToSubstring(int, int) Q_DECL_OVERRIDE {}
-    QString attributes(int, int *, int *) const Q_DECL_OVERRIDE
+    int selectionCount() const override { return 0; }
+    void addSelection(int, int) override {}
+    void removeSelection(int) override {}
+    void setSelection(int, int, int) override {}
+    int cursorPosition() const override { return textWidget()->cursorPosition; }
+    void setCursorPosition(int position) override { textWidget()->cursorPosition = position; }
+    QString text(int startOffset, int endOffset) const override { return textWidget()->text.mid(startOffset, endOffset); }
+    int characterCount() const override { return textWidget()->text.length(); }
+    QRect characterRect(int) const override { return QRect(); }
+    int offsetAtPoint(const QPoint &) const override { return 0; }
+    void scrollToSubstring(int, int) override {}
+    QString attributes(int, int *, int *) const override
     { return QString(); }
 
 private: