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

 Conflicts:
	src/gui/painting/qdrawhelper.cpp

Change-Id: I4916e07b635e1d3830e9b46ef7914f99bec3098e

1 files changed, 7 insertions, 7 deletions

diff --git a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
index 7fdff974c1..0248640369 100644
--- a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
@@ -647,24 +647,24 @@ template<> class QTypeInfo<A> : public QTypeInfoMerger<A, B, C, D> {};
 //! [52]
     struct Foo {
         void overloadedFunction();
-        void overloadedFunction(int, QString);
+        void overloadedFunction(int, const QString &);
     };
     ... qOverload<>(&Foo::overloadedFunction)
-    ... qOverload<int, QString>(&Foo::overloadedFunction)
+    ... qOverload<int, const QString &>(&Foo::overloadedFunction)
 //! [52]
 
 //! [53]
     ... QOverload<>::of(&Foo::overloadedFunction)
-    ... QOverload<int, QString>::of(&Foo::overloadedFunction)
+    ... QOverload<int, const QString &>::of(&Foo::overloadedFunction)
 //! [53]
 
 //! [54]
     struct Foo {
-        void overloadedFunction(int, QString);
-        void overloadedFunction(int, QString) const;
+        void overloadedFunction(int, const QString &);
+        void overloadedFunction(int, const QString &) const;
     };
-    ... qConstOverload<int, QString>(&Foo::overloadedFunction)
-    ... qNonConstOverload<int, QString>(&Foo::overloadedFunction)
+    ... qConstOverload<int, const QString &>(&Foo::overloadedFunction)
+    ... qNonConstOverload<int, const QString &>(&Foo::overloadedFunction)
 //! [54]
 
 //! [qlikely]