summaryrefslogtreecommitdiff
path: root/tests/auto/qgeocoordinate
diff options
context:
space:
mode:
authoralex <alex.blasche@nokia.com>2011-11-10 15:47:51 +1000
committerQt by Nokia <qt-info@nokia.com>2011-11-10 06:51:27 +0100
commit1a39ae8253d4b4a2fc7dc984531d48fe6c07511b (patch)
tree21f5df92e9e45ba6f2b45f44ddffb8b80dfd985b /tests/auto/qgeocoordinate
parent65a550ecfb9c3ed8adf452c923b2b43d71501aca (diff)
downloadqtlocation-1a39ae8253d4b4a2fc7dc984531d48fe6c07511b.tar.gz
QtLocation doesn't support Symbian anymore.
Change-Id: I1f90ecd180ce08976338fc9683a7cef5c1389f59 Reviewed-by: Alex <alex.blasche@nokia.com>
Diffstat (limited to 'tests/auto/qgeocoordinate')
-rw-r--r--tests/auto/qgeocoordinate/qlocationtestutils.cpp26
-rw-r--r--tests/auto/qgeocoordinate/qlocationtestutils_p.h3
-rw-r--r--tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp16
3 files changed, 0 insertions, 45 deletions
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()