From 18260ed21240fe4c2d1892def80353448096e54c Mon Sep 17 00:00:00 2001
From: mfekari <mfekari@rim.com>
Date: Wed, 21 Nov 2012 11:12:12 -0500
Subject: BlackBerry: The MeasurementSystem port was for BlackBerry OS not QNX
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/corelib/tools/qlocale_p.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/corelib/tools/qlocale_p.h')

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;
-- 
cgit v1.2.3