diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-24 14:18:15 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-25 01:00:37 (GMT) |
| commit | bc6e35d94325f4b18caec7ce0824c5beab95cdd7 (patch) | |
| tree | ee49996a353c5f78fc0252adbe68cebb03bd187f | |
| parent | 4404345eaacf6be412312c57a450ba7223db8bb3 (diff) | |
| download | Qt-bc6e35d94325f4b18caec7ce0824c5beab95cdd7.zip Qt-bc6e35d94325f4b18caec7ce0824c5beab95cdd7.tar.gz Qt-bc6e35d94325f4b18caec7ce0824c5beab95cdd7.tar.bz2 | |
Fix a crash in QSystemLocalePrivate::uiLanguages().
Use the correct calling convention. Discovered by the mimetype
test in Qt 5.
Change-Id: I79b97325dd69466885a64c238935107bf14e9a0d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| -rw-r--r-- | src/corelib/tools/qlocale_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qlocale_win.cpp b/src/corelib/tools/qlocale_win.cpp index c098028..5d0b01f 100644 --- a/src/corelib/tools/qlocale_win.cpp +++ b/src/corelib/tools/qlocale_win.cpp @@ -525,7 +525,7 @@ QVariant QSystemLocalePrivate::toCurrencyString(const QSystemLocale::CurrencyToS QVariant QSystemLocalePrivate::uiLanguages() { if (QSysInfo::windowsVersion() >= QSysInfo::WV_VISTA) { - typedef BOOL (*GetUserPreferredUILanguagesFunc) ( + typedef BOOL (WINAPI *GetUserPreferredUILanguagesFunc) ( DWORD dwFlags, PULONG pulNumLanguages, PWSTR pwszLanguagesBuffer, |