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

Conflicts:
	src/corelib/io/qiodevice_p.h
	src/corelib/kernel/qvariant_p.h
	src/corelib/tools/qsimd.cpp
	src/gui/kernel/qguiapplication.cpp
	tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp

Change-Id: I742a093cbb231b282b43e463ec67173e0d29f57a

1 files changed, 3 insertions, 3 deletions

diff --git a/src/corelib/tools/qsharedpointer.h b/src/corelib/tools/qsharedpointer.h
index 67183da778..901862e7a2 100644
--- a/src/corelib/tools/qsharedpointer.h
+++ b/src/corelib/tools/qsharedpointer.h
@@ -114,11 +114,11 @@ public:
 
     ~QWeakPointer();
 
-    QWeakPointer<T> operator=(const QWeakPointer<T> &other);
-    QWeakPointer<T> operator=(const QSharedPointer<T> &other);
+    QWeakPointer<T> &operator=(const QWeakPointer<T> &other);
+    QWeakPointer<T> &operator=(const QSharedPointer<T> &other);
 
     QWeakPointer(const QObject *other);
-    QWeakPointer<T> operator=(const QObject *other);
+    QWeakPointer<T> &operator=(const QObject *other);
 
     void swap(QWeakPointer<T> &other);