diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-20 13:17:57 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-22 09:29:12 +0200 |
| commit | 547d5e1f55102093a9906e4b0c347c7efa073eac (patch) | |
| tree | f51eeda678fb503ff84991e0ceaf460c38cff083 /src | |
| parent | f76161d61f14428a1dc2bd6024a523ebe46fdfea (diff) | |
Windows QPA: Fix deprecated QString::fromUtf16(ushort*) call
Amends 23849826b490c07d9ba656bcb4ac46edd3040c0a.
Change-Id: Iefd29bd4c19aaf7c4444b2913bd143dc11c03d3c
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowscontext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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, |