diff options
author | alex <alex.blasche@nokia.com> | 2011-11-10 15:47:51 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-10 06:51:27 +0100 |
commit | 1a39ae8253d4b4a2fc7dc984531d48fe6c07511b (patch) | |
tree | 21f5df92e9e45ba6f2b45f44ddffb8b80dfd985b /tests/auto | |
parent | 65a550ecfb9c3ed8adf452c923b2b43d71501aca (diff) | |
download | qtlocation-1a39ae8253d4b4a2fc7dc984531d48fe6c07511b.tar.gz |
QtLocation doesn't support Symbian anymore.
Change-Id: I1f90ecd180ce08976338fc9683a7cef5c1389f59
Reviewed-by: Alex <alex.blasche@nokia.com>
Diffstat (limited to 'tests/auto')
8 files changed, 0 insertions, 64 deletions
diff --git a/tests/auto/qgeocodereply/tst_qgeocodereply.cpp b/tests/auto/qgeocodereply/tst_qgeocodereply.cpp index a3a39b08..eb671310 100644 --- a/tests/auto/qgeocodereply/tst_qgeocodereply.cpp +++ b/tests/auto/qgeocodereply/tst_qgeocodereply.cpp @@ -123,11 +123,8 @@ void tst_QGeocodeReply::destructor() QFETCH(QGeocodeReply::Error,error); QFETCH(QString,msg); - QLocationTestUtils::uheap_mark(); qgeocodereplycopy = new QGeocodeReply (error,msg,0); delete qgeocodereplycopy; - QLocationTestUtils::uheap_mark_end(); - } void tst_QGeocodeReply::destructor_data() diff --git a/tests/auto/qgeocoordinate/qlocationtestutils.cpp b/tests/auto/qgeocoordinate/qlocationtestutils.cpp index faeb2d4e..4301b569 100644 --- a/tests/auto/qgeocoordinate/qlocationtestutils.cpp +++ b/tests/auto/qgeocoordinate/qlocationtestutils.cpp @@ -41,40 +41,14 @@ #include "qlocationtestutils_p.h" -#if defined(Q_OS_SYMBIAN) - #include <e32std.h> -#endif - -void QLocationTestUtils::uheap_mark() -{ -#if defined(Q_OS_SYMBIAN) - __UHEAP_MARK; -#endif -} - -void QLocationTestUtils::uheap_mark_end() -{ -#if defined(Q_OS_SYMBIAN) - __UHEAP_MARKEND; -#endif -} - bool QLocationTestUtils::hasDefaultSource() { -#if defined(Q_OS_SYMBIAN) - return true; -#else return false; -#endif } bool QLocationTestUtils::hasDefaultMonitor() { -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) - return true; -#else return false; -#endif } QString QLocationTestUtils::addNmeaChecksumAndBreaks(const QString &sentence) diff --git a/tests/auto/qgeocoordinate/qlocationtestutils_p.h b/tests/auto/qgeocoordinate/qlocationtestutils_p.h index 9add31c5..78eca7fc 100644 --- a/tests/auto/qgeocoordinate/qlocationtestutils_p.h +++ b/tests/auto/qgeocoordinate/qlocationtestutils_p.h @@ -75,9 +75,6 @@ class QLocationTestUtils { public: - static void uheap_mark(); - static void uheap_mark_end(); - static bool hasDefaultSource(); static bool hasDefaultMonitor(); diff --git a/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp b/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp index 91a5c81c..57e7fe4d 100644 --- a/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp +++ b/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp @@ -229,49 +229,33 @@ private slots: { QGeoCoordinate *coordinate; - QLocationTestUtils::uheap_mark(); coordinate = new QGeoCoordinate(); delete coordinate; - QLocationTestUtils::uheap_mark_end(); - QLocationTestUtils::uheap_mark(); coordinate = new QGeoCoordinate(0.0, 0.0); delete coordinate; - QLocationTestUtils::uheap_mark_end(); - QLocationTestUtils::uheap_mark(); coordinate = new QGeoCoordinate(0.0, 0.0, 0.0); delete coordinate; - QLocationTestUtils::uheap_mark_end(); - QLocationTestUtils::uheap_mark(); coordinate = new QGeoCoordinate(90.0, 180.0); delete coordinate; - QLocationTestUtils::uheap_mark_end(); - QLocationTestUtils::uheap_mark(); coordinate = new QGeoCoordinate(-90.0, -180.0); delete coordinate; - QLocationTestUtils::uheap_mark_end(); - QLocationTestUtils::uheap_mark(); coordinate = new QGeoCoordinate(90.1, 180.1); delete coordinate; - QLocationTestUtils::uheap_mark_end(); - QLocationTestUtils::uheap_mark(); coordinate = new QGeoCoordinate(-90.1, -180.1); delete coordinate; - QLocationTestUtils::uheap_mark_end(); } void destructor2() { QFETCH(QGeoCoordinate, c); - QLocationTestUtils::uheap_mark(); QGeoCoordinate *coordinate = new QGeoCoordinate(c); delete coordinate; - QLocationTestUtils::uheap_mark_end(); } void destructor2_data() diff --git a/tests/auto/qgeolocation/tst_qgeolocation.cpp b/tests/auto/qgeolocation/tst_qgeolocation.cpp index ae4292ec..e9388938 100644 --- a/tests/auto/qgeolocation/tst_qgeolocation.cpp +++ b/tests/auto/qgeolocation/tst_qgeolocation.cpp @@ -83,15 +83,11 @@ void tst_QGeoLocation::destructor() { QGeoLocation *qgeolocationcopy; - QLocationTestUtils::uheap_mark(); qgeolocationcopy = new QGeoLocation(); delete qgeolocationcopy; - QLocationTestUtils::uheap_mark_end(); - QLocationTestUtils::uheap_mark(); qgeolocationcopy = new QGeoLocation(m_location); delete qgeolocationcopy; - QLocationTestUtils::uheap_mark_end(); } void tst_QGeoLocation::address() diff --git a/tests/auto/qgeomaneuver/tst_qgeomaneuver.cpp b/tests/auto/qgeomaneuver/tst_qgeomaneuver.cpp index eb6b842e..52f3be79 100644 --- a/tests/auto/qgeomaneuver/tst_qgeomaneuver.cpp +++ b/tests/auto/qgeomaneuver/tst_qgeomaneuver.cpp @@ -91,15 +91,11 @@ void tst_QGeoManeuver::destructor() { QGeoManeuver *qgeomaneuvercopy; - QLocationTestUtils::uheap_mark(); qgeomaneuvercopy = new QGeoManeuver(); delete qgeomaneuvercopy; - QLocationTestUtils::uheap_mark_end(); - QLocationTestUtils::uheap_mark(); qgeomaneuvercopy = new QGeoManeuver(*qgeomaneuver); delete qgeomaneuvercopy; - QLocationTestUtils::uheap_mark_end(); } void tst_QGeoManeuver::direction() diff --git a/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp b/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp index 1d97ac61..88122943 100644 --- a/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp +++ b/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp @@ -182,20 +182,16 @@ void TestQGeoPositionInfoSource::cleanupTestCase() // TC_ID_3_x_1 void TestQGeoPositionInfoSource::constructor_withParent() { - //QLocationTestUtils::uheap_mark(); QObject *parent = new QObject(); new MyPositionSource(parent); delete parent; - //QLocationTestUtils::uheap_mark_end(); } // TC_ID_3_x_2 void TestQGeoPositionInfoSource::constructor_noParent() { - //QLocationTestUtils::uheap_mark(); MyPositionSource *obj = new MyPositionSource(); delete obj; - //QLocationTestUtils::uheap_mark_end(); } void TestQGeoPositionInfoSource::updateInterval() @@ -275,14 +271,12 @@ void TestQGeoPositionInfoSource::preferredPositioningMethods() // sources of location data void TestQGeoPositionInfoSource::createDefaultSource() { - //QLocationTestUtils::uheap_mark(); QObject *parent = new QObject; QGeoPositionInfoSource *source = QGeoPositionInfoSource::createDefaultSource(parent); // now all platforms have the dummy plugin at least QVERIFY(source != 0); delete parent; - //QLocationTestUtils::uheap_mark_end(); } void TestQGeoPositionInfoSource::setUpdateInterval() diff --git a/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource.cpp b/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource.cpp index b251dc65..c47e0164 100644 --- a/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource.cpp +++ b/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource.cpp @@ -156,11 +156,9 @@ void TestQGeoSatelliteInfoSource::test_slot2() void TestQGeoSatelliteInfoSource::constructor_withParent() { - //QLocationTestUtils::uheap_mark(); QObject *parent = new QObject(); new MySatelliteSource(parent); delete parent; - //QLocationTestUtils::uheap_mark_end(); } void TestQGeoSatelliteInfoSource::constructor_noParent() |