From ec486e89e494ec0a45112bea4d4075cc5afd32eb Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Fri, 16 Oct 2020 00:07:58 -0500 Subject: [PATCH] Use char16_t overload of QString::fromUtf16() for Qt 6.0 compatibility --- app/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/main.cpp b/app/main.cpp index 4e769aa9..326c8988 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -196,7 +196,7 @@ LONG WINAPI UnhandledExceptionHandler(struct _EXCEPTION_POINTERS *ExceptionInfo) WCHAR dmpFileName[MAX_PATH]; swprintf_s(dmpFileName, L"%ls\\Moonlight-%I64u.dmp", (PWCHAR)QDir::toNativeSeparators(Path::getLogDir()).utf16(), QDateTime::currentSecsSinceEpoch()); - QString qDmpFileName = QString::fromUtf16((unsigned short*)dmpFileName); + QString qDmpFileName = QString::fromUtf16((const char16_t*)dmpFileName); HANDLE dumpHandle = CreateFileW(dmpFileName, GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr); if (dumpHandle != INVALID_HANDLE_VALUE) { MINIDUMP_EXCEPTION_INFORMATION info;