1 files changed, 5 insertions, 7 deletions
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h
index 2b98787cc2..23972d196c 100644
--- a/src/corelib/tools/qstring.h
+++ b/src/corelib/tools/qstring.h
@@ -1380,14 +1380,12 @@ inline std::wstring QString::toStdWString() const
 {
     std::wstring str;
     str.resize(length());
-
-#ifdef Q_CC_MSVC
-    // VS2005 crashes if the string is empty
-    if (!length())
-        return str;
+#if __cplusplus >= 201703L
+    str.resize(toWCharArray(str.data()));
+#else
+    if (length())
+        str.resize(toWCharArray(&str.front()));
 #endif
-
-    str.resize(toWCharArray(&(*str.begin())));
     return str;
 }