diff options
| author | mfekari <mfekari@rim.com> | 2012-11-21 11:12:12 -0500 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-21 20:13:47 +0100 |
| commit | 18260ed21240fe4c2d1892def80353448096e54c (patch) | |
| tree | 02c8e00f5217b39b0cdf7c8c82b74c6cbc0d1f60 /src/corelib/tools/qlocale_p.h | |
| parent | 3249439b203123ca277b931a34814f383715b0e8 (diff) | |
BlackBerry: The MeasurementSystem port was for BlackBerry OS not QNX
Change-Id: I87708aad18ebe1c6a08fe89376290be66f9c0577
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Sérgio Martins <sergio.martins.qnx@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Diffstat (limited to 'src/corelib/tools/qlocale_p.h')
| -rw-r--r-- | src/corelib/tools/qlocale_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/tools/qlocale_p.h index 4d5d918878..65201374a9 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 @@ -373,17 +373,17 @@ inline char QLocalePrivate::digitToCLocale(QChar in) const return 0; } -#if defined(Q_OS_QNX) -class QBBLocaleData: public QObject +#if defined(Q_OS_BLACKBERRY) +class QQNXLocaleData: public QObject { Q_OBJECT public: - QBBLocaleData(); - virtual ~QBBLocaleData(); + QQNXLocaleData(); + virtual ~QQNXLocaleData(); void readPPSLocale(); public Q_SLOTS: - void updateMesurementSystem(); + void updateMeasurementSystem(); public: uint ppsMeasurement; |