From 547d5e1f55102093a9906e4b0c347c7efa073eac Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 20 May 2020 13:17:57 +0200 Subject: Windows QPA: Fix deprecated QString::fromUtf16(ushort*) call Amends 23849826b490c07d9ba656bcb4ac46edd3040c0a. Change-Id: Iefd29bd4c19aaf7c4444b2913bd143dc11c03d3c Reviewed-by: Marc Mutz --- src/plugins/platforms/windows/qwindowscontext.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins') diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp index 5765b5aa6c..170c2818c3 100644 --- a/src/plugins/platforms/windows/qwindowscontext.cpp +++ b/src/plugins/platforms/windows/qwindowscontext.cpp @@ -712,7 +712,7 @@ int QWindowsContext::screenDepth() const QString QWindowsContext::windowsErrorMessage(unsigned long errorCode) { QString rc = QString::fromLatin1("#%1: ").arg(errorCode); - ushort *lpMsgBuf; + char16_t *lpMsgBuf; const DWORD len = FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, -- cgit v1.2.3