diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-02-28 12:40:48 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-02-28 12:40:48 (GMT) |
| commit | 9cb1ebb9096aedc04f01154cecd7b21a062339a6 (patch) | |
| tree | 3a501c6175d28ff647a103285ba02c5ce7a9e007 /src/corelib | |
| parent | 52b92a21c473c5d92add91bd3e3820ebbbc619ce (diff) | |
| download | Qt-9cb1ebb9096aedc04f01154cecd7b21a062339a6.zip Qt-9cb1ebb9096aedc04f01154cecd7b21a062339a6.tar.gz Qt-9cb1ebb9096aedc04f01154cecd7b21a062339a6.tar.bz2 | |
QLocale: Compile fix for Windows.
Reviewed-by: trustme
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qlocale_win.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/tools/qlocale_win.cpp b/src/corelib/tools/qlocale_win.cpp index ec63d1a..d62c4eb 100644 --- a/src/corelib/tools/qlocale_win.cpp +++ b/src/corelib/tools/qlocale_win.cpp @@ -372,6 +372,7 @@ QString winCurrencySymbol(QLocale::CurrencySymbolFormat format) return QString(); } +#ifndef QT_NO_SYSTEMLOCALE static QString winFormatCurrency(const QSystemLocale::CurrencyToStringArgument &arg) { QString value; @@ -492,8 +493,6 @@ QStringList winUILanguages() return QStringList(QString::fromLatin1(winLangCodeToIsoName(GetUserDefaultUILanguage()))); } -#ifndef QT_NO_SYSTEMLOCALE - QLocale QSystemLocale::fallbackLocale() const { return QLocale(QString::fromLatin1(getWinLocaleName())); |