diff options
author | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-03-21 17:10:48 +0100 |
---|---|---|
committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-03-23 08:43:20 +0000 |
commit | 8b628532736d31c1324cb0c345fd82019a5ce2b8 (patch) | |
tree | 7ec82e482402bf8c7bffca0d2a7eec2e080b1d87 /tests | |
parent | fe16faf08d5e411504ab16ab9d2726cfae4bc03e (diff) | |
download | qtlocation-8b628532736d31c1324cb0c345fd82019a5ce2b8.tar.gz |
Declare/Register metatype for QGeoPositionInfo
Instead of doing it all over the place, declare it in
qgeopositioninfo.h and register it in
QGeoPositionInfoSource() as well as in positioning.cpp
Task-number: QTBUG-65937
Change-Id: I819af3393921bdc9ca46832d5b4181d41546dac0
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'tests')
7 files changed, 2 insertions, 12 deletions
diff --git a/tests/auto/positionplugintest/tst_positionplugin.cpp b/tests/auto/positionplugintest/tst_positionplugin.cpp index 6e8847b8..032b11f8 100644 --- a/tests/auto/positionplugintest/tst_positionplugin.cpp +++ b/tests/auto/positionplugintest/tst_positionplugin.cpp @@ -37,8 +37,6 @@ QT_USE_NAMESPACE -Q_DECLARE_METATYPE(QGeoPositionInfo) - class tst_PositionPlugin : public QObject { Q_OBJECT @@ -65,7 +63,6 @@ void tst_PositionPlugin::initTestCase() + QStringLiteral("/../../../plugins")); #endif #endif - qRegisterMetaType<QGeoPositionInfo>(); } void tst_PositionPlugin::availableSources() diff --git a/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp b/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp index 4cd83446..bad3be42 100644 --- a/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp +++ b/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp @@ -52,7 +52,6 @@ QT_USE_NAMESPACE #define UPDATE_INTERVAL 200 -Q_DECLARE_METATYPE(QGeoPositionInfo) Q_DECLARE_METATYPE(QGeoAreaMonitorInfo) QString tst_qgeoareamonitorinfo_debug; @@ -89,7 +88,6 @@ private slots: + QStringLiteral("/../../../plugins")); #endif #endif - qRegisterMetaType<QGeoPositionInfo>(); qRegisterMetaType<QGeoAreaMonitorInfo>(); } diff --git a/tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp b/tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp index 72904e1d..f236b398 100644 --- a/tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp +++ b/tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp @@ -40,7 +40,6 @@ QT_USE_NAMESPACE -Q_DECLARE_METATYPE(QGeoPositionInfo) Q_DECLARE_METATYPE(QGeoPositionInfo::Attribute) QByteArray tst_qgeopositioninfo_debug; diff --git a/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp b/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp index 0fc8f492..fa073308 100644 --- a/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp +++ b/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp @@ -45,7 +45,6 @@ Q_DECLARE_METATYPE(QGeoPositionInfoSource::PositioningMethod) Q_DECLARE_METATYPE(QGeoPositionInfoSource::PositioningMethods) -Q_DECLARE_METATYPE(QGeoPositionInfo) #define MAX_WAITING_TIME 50000 @@ -141,7 +140,7 @@ void TestQGeoPositionInfoSource::test_slot2() void TestQGeoPositionInfoSource::base_initTestCase() { - qRegisterMetaType<QGeoPositionInfo>(); + } void TestQGeoPositionInfoSource::base_init() diff --git a/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp b/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp index 4468f914..e07fb707 100644 --- a/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp +++ b/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp @@ -37,7 +37,6 @@ #include <QTest> Q_DECLARE_METATYPE(QNmeaPositionInfoSource::UpdateMode) -Q_DECLARE_METATYPE(QGeoPositionInfo) class DummyNmeaPositionInfoSource : public QNmeaPositionInfoSource { @@ -95,7 +94,7 @@ tst_DummyNmeaPositionInfoSource::tst_DummyNmeaPositionInfoSource() {} void tst_DummyNmeaPositionInfoSource::initTestCase() { - qRegisterMetaType<QGeoPositionInfo>(); + } void tst_DummyNmeaPositionInfoSource::testOverloadedParseFunction() diff --git a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.cpp b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.cpp index c77e465d..9dd837e6 100644 --- a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.cpp +++ b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.cpp @@ -70,7 +70,6 @@ tst_QNmeaPositionInfoSource::tst_QNmeaPositionInfoSource(QNmeaPositionInfoSource void tst_QNmeaPositionInfoSource::initTestCase() { - qRegisterMetaType<QGeoPositionInfo>(); qRegisterMetaType<QNmeaPositionInfoSource::UpdateMode>(); } diff --git a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h index 844dfbad..60a4093c 100644 --- a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h +++ b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h @@ -45,7 +45,6 @@ QT_USE_NAMESPACE Q_DECLARE_METATYPE(QNmeaPositionInfoSource::UpdateMode) -Q_DECLARE_METATYPE(QGeoPositionInfo) Q_DECLARE_METATYPE(QList<QDateTime>) class tst_QNmeaPositionInfoSource : public QObject |