diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-06-10 12:06:56 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-06-10 12:06:56 (GMT) |
| commit | ef0a51654783f942499cfa9fca60d18c2fa6a702 (patch) | |
| tree | 1fd8158f883562a3ef000b0a4d26df5b1f064dae /src/corelib/tools/qlocale.cpp | |
| parent | 53632d45ca64ad4c20d4302e0826c0234877dd69 (diff) | |
| parent | 62725a02652cee576efe055d1371765945045026 (diff) | |
| download | Qt-ef0a51654783f942499cfa9fca60d18c2fa6a702.zip Qt-ef0a51654783f942499cfa9fca60d18c2fa6a702.tar.gz Qt-ef0a51654783f942499cfa9fca60d18c2fa6a702.tar.bz2 | |
Merge commit 'qt-mainline/master' into master-recursivepaint
Diffstat (limited to 'src/corelib/tools/qlocale.cpp')
| -rw-r--r-- | src/corelib/tools/qlocale.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index 00132d7..4898e10 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -772,7 +772,7 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const Instead it can return a "Windows code". This maps windows codes to ISO country names. */ struct WindowsToISOListElt { - int windows_code; + ushort windows_code; char iso_name[6]; }; |