diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-02-14 14:28:22 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-17 15:39:48 +0100 |
| commit | 9b7cf2b63fb9f9ff7b3c5f05b8e916c85c66403b (patch) | |
| tree | 0c9daae98120a6681e7fb29c39dd97da7af90732 /tests/auto/qgeocoordinate | |
| parent | 010c7a9fb3a9d326e7595b5c95a80d99b4fe7e7e (diff) | |
| download | qtlocation-9b7cf2b63fb9f9ff7b3c5f05b8e916c85c66403b.tar.gz | |
Replace QT_ARCH usage with Q_PROCESSOR_* and Q_OS_* equivalents
QT_ARCH_ARM should be Q_PROCESSOR_ARM, and QT_ARCH_WINDOWSCE and
QT_ARCH_SYMBIAN should be Q_OS_WINCE and Q_OS_SYMBIAN
Change-Id: Ia392591c5eb996b29a3e9c54ec86990ed760b63b
Reviewed-by: Alex <alex.blasche@nokia.com>
Diffstat (limited to 'tests/auto/qgeocoordinate')
| -rw-r--r-- | tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp b/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp index 444c7812..f8df6b5f 100644 --- a/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp +++ b/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp @@ -521,7 +521,7 @@ private slots: << qreal(1374820.1618767744) << qreal(211.1717286649) // the following platforms use float for qreal -#if !defined(QT_NO_FPU) && !defined(QT_ARCH_ARM) && !defined(QT_ARCH_WINDOWSCE) && !defined(QT_ARCH_SYMBIAN) +#if !defined(QT_NO_FPU) && !defined(Q_PROCESSOR_ARM) && !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) << MELBOURNE; #else << QGeoCoordinate(-37.8142515084775, 144.963170622944); @@ -531,7 +531,7 @@ private slots: << qreal(5570538.4987236429) << qreal(288.3388804508) // the following platforms use float for qreal -#if !defined(QT_NO_FPU) && !defined(QT_ARCH_ARM) && !defined(QT_ARCH_WINDOWSCE) && !defined(QT_ARCH_SYMBIAN) +#if !defined(QT_NO_FPU) && !defined(Q_PROCESSOR_ARM) && !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) << NEW_YORK; #else << QGeoCoordinate(40.7145220608416, -74.0071216045375); @@ -541,7 +541,7 @@ private slots: << qreal(20015109.4154876769) << qreal(180.0) // the following platforms use float for qreal -#if !defined(QT_NO_FPU) && !defined(QT_ARCH_ARM) && !defined(QT_ARCH_WINDOWSCE) && !defined(QT_ARCH_SYMBIAN) +#if !defined(QT_NO_FPU) && !defined(Q_PROCESSOR_ARM) && !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) << SOUTH_POLE; #else << QGeoCoordinate(-89.9999947369857, -90.0); |