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/qlocale_p.h | |
| 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/qlocale_p.h')
| -rw-r--r-- | src/corelib/tools/qlocale_p.h | 6 |
1 files changed, 3 insertions, 3 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; |