diff options
| author | Samuli Piippo <samuli.piippo@digia.com> | 2013-01-25 13:18:08 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-01 07:52:16 +0100 |
| commit | c574e4bf2e96fe434eab71609fa4d768cc958c79 (patch) | |
| tree | 8c186674e8769192b57c8d9639cd7d4387bf6cf2 /src/corelib/tools | |
| parent | 607956f6f76de283b22f431d474fbf43de6d2db7 (diff) | |
| download | qt4-tools-c574e4bf2e96fe434eab71609fa4d768cc958c79.tar.gz | |
BlackBerry: The MeasurementSystem port was for BlackBerry OS not QNX
(cherry picked from qtbase/18260ed21240fe4c2d1892def80353448096e54c)
Change-Id: I4de18389fc3ad7743d80b3f72b44083708d72e77
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qlocale_p.h | 6 | ||||
| -rw-r--r-- | src/corelib/tools/qlocale_unix.cpp | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/tools/qlocale_p.h index 445d7c22a0..780055ee7a 100644 --- a/src/corelib/tools/qlocale_p.h +++ b/src/corelib/tools/qlocale_p.h @@ -59,7 +59,7 @@ #include "qlocale.h" -#if defined(Q_OS_QNX) +#if defined(Q_OS_BLACKBERRY) #include "qsocketnotifier.h" #endif @@ -275,7 +275,7 @@ private: }; #endif -#if defined(Q_OS_QNX) +#if defined(Q_OS_BLACKBERRY) class QBBLocaleData: public QObject { Q_OBJECT @@ -285,7 +285,7 @@ public: void readPPSLocale(); public Q_SLOTS: - void updateMesurementSystem(); + void updateMeasurementSystem(); public: uint ppsMeasurement; diff --git a/src/corelib/tools/qlocale_unix.cpp b/src/corelib/tools/qlocale_unix.cpp index daf74fbb9d..b9d228e796 100644 --- a/src/corelib/tools/qlocale_unix.cpp +++ b/src/corelib/tools/qlocale_unix.cpp @@ -46,7 +46,7 @@ #include "qstringlist.h" #include "qvariant.h" -#if defined(Q_OS_QNX) +#if defined(Q_OS_BLACKBERRY) #include <QtCore/private/qcore_unix_p.h> #include <QCoreApplication> @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE -#if defined(Q_OS_QNX) +#if defined(Q_OS_BLACKBERRY) static const char ppsServicePath[] = "/pps/services/locale/uom"; static const size_t ppsBufferSize = 256; @@ -74,7 +74,7 @@ QBBLocaleData::~QBBLocaleData() qt_safe_close(ppsFd); } -void QBBLocaleData::updateMesurementSystem() +void QBBLocaleData::updateMeasurementSystem() { char buffer[ppsBufferSize]; @@ -114,10 +114,10 @@ void QBBLocaleData::readPPSLocale() return; } - updateMesurementSystem(); + updateMeasurementSystem(); if (QCoreApplication::instance()) { ppsNotifier = new QSocketNotifier(ppsFd, QSocketNotifier::Read, this); - QObject::connect(ppsNotifier, SIGNAL(activated(int)), this, SLOT(updateMesurementSystem())); + QObject::connect(ppsNotifier, SIGNAL(activated(int)), this, SLOT(updateMeasurementSystem())); } } #endif @@ -188,7 +188,7 @@ struct QSystemLocaleData Q_GLOBAL_STATIC(QSystemLocaleData, qSystemLocaleData) #endif -#if defined(Q_OS_QNX) +#if defined(Q_OS_BLACKBERRY) Q_GLOBAL_STATIC(QBBLocaleData, qbbLocaleData) #endif @@ -208,7 +208,7 @@ QLocale QSystemLocale::fallbackLocale() const QVariant QSystemLocale::query(QueryType type, QVariant in) const { QSystemLocaleData *d = qSystemLocaleData(); -#if defined(Q_OS_QNX) +#if defined(Q_OS_BLACKBERRY) QBBLocaleData *bbd = qbbLocaleData(); #endif const QLocale &lc_numeric = d->lc_numeric; @@ -290,7 +290,7 @@ QVariant QSystemLocale::query(QueryType type, QVariant in) const return QLocale::MetricSystem; if (meas_locale.compare(QLatin1String("Other"), Qt::CaseInsensitive) == 0) return QLocale::MetricSystem; -#if defined(Q_OS_QNX) +#if defined(Q_OS_BLACKBERRY) return bbd->ppsMeasurement; #endif return QVariant((int)QLocale(meas_locale).measurementSystem()); |