diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-06-09 01:08:46 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-06-09 01:08:46 (GMT) |
| commit | 1be6074e180d9936c8421125da1788e37d4204c0 (patch) | |
| tree | 086bc40aa3bccf9cc378c9ca44c427e3f67ea2c0 /src | |
| parent | 1bbe23c5814dfda4cc6154c49e5bbf7c6ead7eba (diff) | |
| parent | 3ac9b6bdeb9f7522fa857fbc25a9da48e6d82186 (diff) | |
| download | Qt-1be6074e180d9936c8421125da1788e37d4204c0.zip Qt-1be6074e180d9936c8421125da1788e37d4204c0.tar.gz Qt-1be6074e180d9936c8421125da1788e37d4204c0.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src')
| -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; |