diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-06-09 00:50:10 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-06-09 00:50:10 (GMT) |
| commit | 3ac9b6bdeb9f7522fa857fbc25a9da48e6d82186 (patch) | |
| tree | 35e2c286e5cbf119aa22763a9708e316ec566c91 /src/gui/util | |
| parent | 70283a0a87e46a8aa9d2e6296f4ed7c93cc230d6 (diff) | |
| download | Qt-3ac9b6bdeb9f7522fa857fbc25a9da48e6d82186.zip Qt-3ac9b6bdeb9f7522fa857fbc25a9da48e6d82186.tar.gz Qt-3ac9b6bdeb9f7522fa857fbc25a9da48e6d82186.tar.bz2 | |
Fixed compile with MinGW 3.4.
This compiler doesn't seem to follow the same rule as others
for implicit conversions to/from wchar_t.
Add the necessary casts, keeping in mind that sizeof(wchar_t) == 2
on Windows.
Diffstat (limited to 'src/gui/util')
| -rw-r--r-- | src/gui/util/qdesktopservices_win.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/util/qdesktopservices_win.cpp b/src/gui/util/qdesktopservices_win.cpp index 8d2701c..9f8efb4 100644 --- a/src/gui/util/qdesktopservices_win.cpp +++ b/src/gui/util/qdesktopservices_win.cpp @@ -115,11 +115,11 @@ static bool launchWebBrowser(const QUrl &url) if (res == ERROR_SUCCESS) { returnValue = RegQueryValueEx(handle, L"Progid", 0, 0, reinterpret_cast<unsigned char*>(keyValue), &bufferSize); if (!returnValue) - keyName = QString::fromUtf16(keyValue); + keyName = QString::fromUtf16((const ushort*)keyValue); RegCloseKey(handle); } keyName += QLatin1String("\\Shell\\Open\\Command"); - res = RegOpenKeyExW(HKEY_CLASSES_ROOT, keyName.utf16(), 0, KEY_READ, &handle); + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, (const wchar_t*)keyName.utf16(), 0, KEY_READ, &handle); if (res != ERROR_SUCCESS) return false; |