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

Conflicts:
	mkspecs/features/qt.prf
	src/plugins/platforms/xcb/qxcbwindow.h
	src/tools/qdoc/qdocindexfiles.cpp
	src/widgets/kernel/qwidget_qpa.cpp

Change-Id: I214f57b03bc2ff86cf3b7dfe2966168af93a5a67

1 files changed, 5 insertions, 4 deletions

diff --git a/src/winmain/qtmain_winrt.cpp b/src/winmain/qtmain_winrt.cpp
index eef23130f9..bcb3445bcd 100644
--- a/src/winmain/qtmain_winrt.cpp
+++ b/src/winmain/qtmain_winrt.cpp
@@ -74,6 +74,7 @@ extern "C" {
 using namespace ABI::Windows::ApplicationModel;
 using namespace ABI::Windows::Foundation;
 using namespace Microsoft::WRL;
+using namespace Microsoft::WRL::Wrappers;
 
 #define qHString(x) Wrappers::HString::MakeReference(x).Get()
 #define CoreApplicationClass RuntimeClass_Windows_ApplicationModel_Core_CoreApplication
@@ -186,11 +187,11 @@ private:
             for (int i = m_argc; i < m_argv.size(); ++i)
                 delete[] m_argv[i];
             m_argv.resize(m_argc);
-            HSTRING arguments;
-            launchArgs->get_Arguments(&arguments);
-            if (arguments) {
+            HString arguments;
+            launchArgs->get_Arguments(arguments.GetAddressOf());
+            if (arguments.IsValid()) {
                 foreach (const QByteArray &arg, QString::fromWCharArray(
-                             WindowsGetStringRawBuffer(arguments, nullptr)).toLocal8Bit().split(' ')) {
+                             arguments.GetRawBuffer(nullptr)).toLocal8Bit().split(' ')) {
                     m_argv.append(qstrdup(arg.constData()));
                 }
             }