Merge remote-tracking branch 'origin/5.5.0' into 5.5

Conflicts:
	src/plugins/platforms/cocoa/qcocoafiledialoghelper.h

Manually fixed src/testlib/qtestcase.cpp to return the right type.

Change-Id: Id1634dbe3d73fefe9431b9f5378846cb187624e4

4 files changed, 12 insertions, 19 deletions

diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index 5b6bae7cab..f2764ac425 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -2743,7 +2743,7 @@ const QString &QAccessibleActionInterface::toggleAction()
     Returns the name of the scroll left default action.
     \sa actionNames(), localizedActionName()
   */
-const QString &QAccessibleActionInterface::scrollLeftAction()
+QString QAccessibleActionInterface::scrollLeftAction()
 {
     return accessibleActionStrings()->scrollLeftAction;
 }
@@ -2752,7 +2752,7 @@ const QString &QAccessibleActionInterface::scrollLeftAction()
     Returns the name of the scroll right default action.
     \sa actionNames(), localizedActionName()
   */
-const QString &QAccessibleActionInterface::scrollRightAction()
+QString QAccessibleActionInterface::scrollRightAction()
 {
     return accessibleActionStrings()->scrollRightAction;
 }
@@ -2761,7 +2761,7 @@ const QString &QAccessibleActionInterface::scrollRightAction()
     Returns the name of the scroll up default action.
     \sa actionNames(), localizedActionName()
   */
-const QString &QAccessibleActionInterface::scrollUpAction()
+QString QAccessibleActionInterface::scrollUpAction()
 {
     return accessibleActionStrings()->scrollUpAction;
 }
@@ -2770,7 +2770,7 @@ const QString &QAccessibleActionInterface::scrollUpAction()
     Returns the name of the scroll down default action.
     \sa actionNames(), localizedActionName()
   */
-const QString &QAccessibleActionInterface::scrollDownAction()
+QString QAccessibleActionInterface::scrollDownAction()
 {
     return accessibleActionStrings()->scrollDownAction;
 }
@@ -2779,7 +2779,7 @@ const QString &QAccessibleActionInterface::scrollDownAction()
     Returns the name of the previous page default action.
     \sa actionNames(), localizedActionName()
   */
-const QString &QAccessibleActionInterface::previousPageAction()
+QString QAccessibleActionInterface::previousPageAction()
 {
     return accessibleActionStrings()->previousPageAction;
 }
@@ -2788,7 +2788,7 @@ const QString &QAccessibleActionInterface::previousPageAction()
     Returns the name of the next page default action.
     \sa actionNames(), localizedActionName()
   */
-const QString &QAccessibleActionInterface::nextPageAction()
+QString QAccessibleActionInterface::nextPageAction()
 {
     return accessibleActionStrings()->nextPageAction;
 }
diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h
index faa8cd719d..bfe1e6c542 100644
--- a/src/gui/accessible/qaccessible.h
+++ b/src/gui/accessible/qaccessible.h
@@ -636,12 +636,12 @@ public:
     static const QString &showMenuAction();
     static const QString &setFocusAction();
     static const QString &toggleAction();
-    static const QString &scrollLeftAction();
-    static const QString &scrollRightAction();
-    static const QString &scrollUpAction();
-    static const QString &scrollDownAction();
-    static const QString &nextPageAction();
-    static const QString &previousPageAction();
+    static QString scrollLeftAction();
+    static QString scrollRightAction();
+    static QString scrollUpAction();
+    static QString scrollDownAction();
+    static QString nextPageAction();
+    static QString previousPageAction();
 };
 
 class Q_GUI_EXPORT QAccessibleImageInterface
diff --git a/src/gui/kernel/qplatformdialoghelper.cpp b/src/gui/kernel/qplatformdialoghelper.cpp
index 3d7c2f7bf0..3d37088182 100644
--- a/src/gui/kernel/qplatformdialoghelper.cpp
+++ b/src/gui/kernel/qplatformdialoghelper.cpp
@@ -137,12 +137,6 @@ QVariant  QPlatformDialogHelper::defaultStyleHint(QPlatformDialogHelper::StyleHi
     return QVariant();
 }
 
-void QPlatformDialogHelper::execModalForWindow(QWindow *parent)
-{
-    Q_UNUSED(parent);
-    exec();
-}
-
 // Font dialog
 
 class QFontDialogOptionsPrivate : public QSharedData
diff --git a/src/gui/kernel/qplatformdialoghelper.h b/src/gui/kernel/qplatformdialoghelper.h
index 6d3a367e60..8b2b9881b7 100644
--- a/src/gui/kernel/qplatformdialoghelper.h
+++ b/src/gui/kernel/qplatformdialoghelper.h
@@ -145,7 +145,6 @@ public:
     virtual QVariant styleHint(StyleHint hint) const;
 
     virtual void exec() = 0;
-    virtual void execModalForWindow(QWindow *parent);
     virtual bool show(Qt::WindowFlags windowFlags,
                           Qt::WindowModality windowModality,
                           QWindow *parent) = 0;