From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Fri, 24 Feb 2012 14:18:15 +0000 (+0100)
Subject: Fix a crash in QSystemLocalePrivate::uiLanguages().
X-Git-Tag: qt-v5.0.0-alpha1~771
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1118f28b86993282b9fcf78e938bff5ef2017a09;p=profile%2Fivi%2Fqtbase.git

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>
(cherry picked from commit bc6e35d94325f4b18caec7ce0824c5beab95cdd7)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---

diff --git a/src/corelib/tools/qlocale_win.cpp b/src/corelib/tools/qlocale_win.cpp
index cd9fffc..e787f2f 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,