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

Conflicts:
	configure
	mkspecs/macx-xcode/Info.plist.app
	mkspecs/macx-xcode/Info.plist.lib
	qmake/doc/qmake.qdocconf
	src/corelib/global/qglobal.h
	tests/auto/other/exceptionsafety/exceptionsafety.pro
	tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp

Change-Id: I3c769a4a82dc2e99a12c69123fbf17613fd2ac2a

1 files changed, 3 insertions, 3 deletions

diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp
index 188deb4f94..a2d3891f00 100644
--- a/src/corelib/tools/qbytearray.cpp
+++ b/src/corelib/tools/qbytearray.cpp
@@ -586,7 +586,7 @@ QByteArray qUncompress(const uchar* data, int nbytes)
             d->data()[len] = 0;
 
             {
-                QByteArrayDataPtr dataPtr = { reinterpret_cast<QByteArrayData *>(d.take()) };
+                QByteArrayDataPtr dataPtr = { d.take() };
                 return QByteArray(dataPtr);
             }
 
@@ -3152,7 +3152,7 @@ QByteArray QByteArray::trimmed() const
     }
     int l = end - start + 1;
     if (l <= 0) {
-        QByteArrayDataPtr empty = { reinterpret_cast<QByteArrayData *>(Data::allocate(0)) };
+        QByteArrayDataPtr empty = { Data::allocate(0) };
         return QByteArray(empty);
     }
     return QByteArray(s+start, l);
@@ -3889,7 +3889,7 @@ QByteArray QByteArray::fromRawData(const char *data, int size)
         x = Data::fromRawData(data, size);
         Q_CHECK_PTR(x);
     }
-    QByteArrayDataPtr dataPtr = { reinterpret_cast<QByteArrayData *>(x) };
+    QByteArrayDataPtr dataPtr = { x };
     return QByteArray(dataPtr);
 }