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, 3 insertions, 3 deletions

diff --git a/src/corelib/io/qstandardpaths_winrt.cpp b/src/corelib/io/qstandardpaths_winrt.cpp
index 172ea3fc3d..aa3b710f52 100644
--- a/src/corelib/io/qstandardpaths_winrt.cpp
+++ b/src/corelib/io/qstandardpaths_winrt.cpp
@@ -90,10 +90,10 @@ QString QStandardPaths::writableLocation(StandardLocation type)
         ComPtr<IStorageItem> settingsFolderItem;
         if (FAILED(settingsFolder.As(&settingsFolderItem)))
             break;
-        HSTRING path;
-        if (FAILED(settingsFolderItem->get_Path(&path)))
+        HString path;
+        if (FAILED(settingsFolderItem->get_Path(path.GetAddressOf())))
             break;
-        result = convertCharArray(WindowsGetStringRawBuffer(path, nullptr));
+        result = convertCharArray(path.GetRawBuffer(nullptr));
         if (isTestModeEnabled())
             result += QLatin1String("/qttest");
         break;