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

Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/global/qglobal.h
	src/corelib/global/qsysinfo.h
	src/corelib/global/qsystemdetection.h
	src/corelib/kernel/qobjectdefs.h
	src/plugins/plugins.pro
	tests/auto/widgets/itemviews/qlistview/qlistview.pro

Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c

3 files changed, 14 insertions, 14 deletions

diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index 0edccd32a7..dc6933f9ff 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -85,7 +85,7 @@ QT_BEGIN_NAMESPACE
     to replace or extend the default behavior of the static functions
     in QAccessible.
 
-    Qt supports Microsoft Active Accessibility (MSAA), Mac OS X
+    Qt supports Microsoft Active Accessibility (MSAA), OS X
     Accessibility, and the Unix/X11 AT-SPI standard. Other backends
     can be supported using QAccessibleBridge.
 
@@ -2833,7 +2833,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;
 }
@@ -2842,7 +2842,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;
 }
@@ -2851,7 +2851,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;
 }
@@ -2860,7 +2860,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;
 }
@@ -2869,7 +2869,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;
 }
@@ -2878,7 +2878,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 a0281d1c11..a40d7209c3 100644
--- a/src/gui/accessible/qaccessible.h
+++ b/src/gui/accessible/qaccessible.h
@@ -635,12 +635,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/accessible/qaccessiblebridge.cpp b/src/gui/accessible/qaccessiblebridge.cpp
index b4f28a6968..ddee4b0676 100644
--- a/src/gui/accessible/qaccessiblebridge.cpp
+++ b/src/gui/accessible/qaccessiblebridge.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
     \ingroup accessibility
     \inmodule QtWidgets
 
-    Qt supports Microsoft Active Accessibility (MSAA), Mac OS X
+    Qt supports Microsoft Active Accessibility (MSAA), OS X
     Accessibility, and the Unix/X11 AT-SPI standard. By subclassing
     QAccessibleBridge, you can support other backends than the
     predefined ones.