diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-13 20:32:10 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-13 20:32:40 (GMT) |
| commit | 9e5176070cdeba3e96f1969cfbb71bbd407a651e (patch) | |
| tree | 8213071f20d7081f1b978fa245832bdc04efc1ee | |
| parent | 31486a63ebc74964ad63cf3187b4476d6563b841 (diff) | |
| download | Qt-9e5176070cdeba3e96f1969cfbb71bbd407a651e.zip Qt-9e5176070cdeba3e96f1969cfbb71bbd407a651e.tar.gz Qt-9e5176070cdeba3e96f1969cfbb71bbd407a651e.tar.bz2 | |
Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)
Reviewed-By: Trust Me
| -rw-r--r-- | src/corelib/tools/qlocale.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/tools/qlocale_p.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index 1df4fa0..dd41154 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -1460,9 +1460,9 @@ bool QLocalePrivate::isUninitializedSystemLocale() const return this == maybeSystemPrivate() && m_language_id == 0; } -QVariant QLocalePrivate::querySystemLocale(QSystemLocale::QueryType type, const QVariant &in) const +QVariant QLocalePrivate::querySystemLocale(int type, const QVariant &in) const { - QVariant res = systemLocale()->query(type, in); + QVariant res = systemLocale()->query(QSystemLocale::QueryType(type), in); if (res.isNull() && isUninitializedSystemLocale()) { // if we were not able to get data from the system, initialize the // system locale private data (which is essentially equals to this) diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/tools/qlocale_p.h index b1bdea7..6c0935b 100644 --- a/src/corelib/tools/qlocale_p.h +++ b/src/corelib/tools/qlocale_p.h @@ -133,7 +133,7 @@ public: inline char digitToCLocale(const QChar &c) const; inline bool isUninitializedSystemLocale() const; - QVariant querySystemLocale(QSystemLocale::QueryType type, const QVariant &in) const; + QVariant querySystemLocale(int type, const QVariant &in) const; static void updateSystemPrivate(); enum NumberMode { IntegerMode, DoubleStandardMode, DoubleScientificMode }; |