diff --git a/src/corelib/io/qdebug.cpp b/src/corelib/io/qdebug.cpp
index fc70e066f78..ff9c96ca4d0 100644
--- a/src/corelib/io/qdebug.cpp
+++ b/src/corelib/io/qdebug.cpp
@@ -318,7 +318,7 @@ void QDebug::putString(const QChar *begin, size_t length)
         // we'll reset the QTextStream formatting mechanisms, so save the state
         QDebugStateSaver saver(*this);
         stream->ts.d_ptr->params.reset();
-        putEscapedString(stream->ts.d_ptr.data(), reinterpret_cast<const char16_t *>(begin), length);
+        putEscapedString(stream->ts.d_ptr.get(), reinterpret_cast<const char16_t *>(begin), length);
     }
 }
 
@@ -338,7 +338,7 @@ void QDebug::putByteArray(const char *begin, size_t length, Latin1Content conten
         // we'll reset the QTextStream formatting mechanisms, so save the state
         QDebugStateSaver saver(*this);
         stream->ts.d_ptr->params.reset();
-        putEscapedString(stream->ts.d_ptr.data(), reinterpret_cast<const uchar *>(begin),
+        putEscapedString(stream->ts.d_ptr.get(), reinterpret_cast<const uchar *>(begin),
                          length, content == ContainsLatin1);
     }
 }
diff --git a/src/corelib/serialization/qtextstream.h b/src/corelib/serialization/qtextstream.h
index 7a0fc42a68b..84fa14ec5ed 100644
--- a/src/corelib/serialization/qtextstream.h
+++ b/src/corelib/serialization/qtextstream.h
@@ -6,9 +6,10 @@
 
 #include <QtCore/qiodevicebase.h>
 #include <QtCore/qchar.h>
-#include <QtCore/qscopedpointer.h>
 #include <QtCore/qstringconverter_base.h>
 
+#include <memory>
+
 #include <stdio.h>
 
 #if 0
@@ -174,7 +175,7 @@ private:
     friend class QDebugStateSaverPrivate;
     friend class QDebug;
 
-    QScopedPointer<QTextStreamPrivate> d_ptr;
+    std::unique_ptr<QTextStreamPrivate> d_ptr;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QTextStream::NumberFlags)