diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-19 17:54:42 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-19 17:54:42 +0200 |
commit | 0c650faa03f2249f7e2c3632309f8b7e0af7c0a7 (patch) | |
tree | 938ab65e816dca602b9364d7eb34c9537322f5a2 | |
parent | e498d760230c272625d6bff2aefcf08192d15bdb (diff) | |
parent | 7fe7f504d239d606bd96716e9c48cea817d6de1c (diff) |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I0974651122fd117557647a1a04d07cf116f0e140
-rw-r--r-- | src/winextras/qwinfunctions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/winextras/qwinfunctions.cpp b/src/winextras/qwinfunctions.cpp index 15d2cfc..ed32934 100644 --- a/src/winextras/qwinfunctions.cpp +++ b/src/winextras/qwinfunctions.cpp @@ -216,7 +216,7 @@ static inline QString errorMessageFromComError(const _com_error &comError) TCHAR *message = Q_NULLPTR; FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, comError.Error(), MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT), - message, 0, NULL); + reinterpret_cast<LPWSTR>(&message), 0, NULL); if (message) { const QString result = QString::fromWCharArray(message).trimmed(); LocalFree((HLOCAL)message); |