Revert "Don't require applications to declare metatypes."

This reverts commit 5679a86968a6a26f8427b9c979f89f6ea5198d2f

Change was source incompatible.

Change-Id: Ied25ca3503a41e498a5c9b710e7a0dd3787bbe89
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

10 files changed, 8 insertions, 8 deletions

diff --git a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp
index fd299a6c..fc0b8b99 100644
--- a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp
+++ b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp
@@ -132,8 +132,6 @@ QGeoPositionInfoSourceGeoclueMaster::QGeoPositionInfoSourceGeoclueMaster(QObject
     }
 #endif
 
-    qRegisterMetaType<QGeoPositionInfo>();
-
     m_requestTimer.setSingleShot(true);
     QObject::connect(&m_requestTimer, SIGNAL(timeout()), this, SLOT(requestUpdateTimeout()));
     QObject::connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(startUpdatesTimeout()));
diff --git a/src/positioning/qgeopositioninfo.h b/src/positioning/qgeopositioninfo.h
index 4012bd25..cee8935a 100644
--- a/src/positioning/qgeopositioninfo.h
+++ b/src/positioning/qgeopositioninfo.h
@@ -112,6 +112,4 @@ Q_POSITIONING_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoPositionIn
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QGeoPositionInfo)
-
 #endif
diff --git a/src/positioning/qgeosatelliteinfo.h b/src/positioning/qgeosatelliteinfo.h
index 3e5ff3dd..fb13157d 100644
--- a/src/positioning/qgeosatelliteinfo.h
+++ b/src/positioning/qgeosatelliteinfo.h
@@ -43,8 +43,6 @@
 
 #include <QtPositioning/qpositioningglobal.h>
 
-#include <QtCore/QMetaType>
-
 QT_BEGIN_NAMESPACE
 
 class QDebug;
@@ -113,6 +111,4 @@ Q_POSITIONING_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoSatelliteI
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QGeoSatelliteInfo)
-
 #endif
diff --git a/tests/auto/positionplugintest/tst_positionplugin.cpp b/tests/auto/positionplugintest/tst_positionplugin.cpp
index 0d4c8051..f152e762 100644
--- a/tests/auto/positionplugintest/tst_positionplugin.cpp
+++ b/tests/auto/positionplugintest/tst_positionplugin.cpp
@@ -50,6 +50,8 @@
 
 QT_USE_NAMESPACE
 
+Q_DECLARE_METATYPE(QGeoPositionInfo)
+
 class tst_PositionPlugin : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp b/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp
index 9f1e0ece..cd9894e5 100644
--- a/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp
+++ b/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp
@@ -65,6 +65,7 @@
 QT_USE_NAMESPACE
 #define UPDATE_INTERVAL 200
 
+Q_DECLARE_METATYPE(QGeoPositionInfo)
 Q_DECLARE_METATYPE(QGeoAreaMonitorInfo)
 
 class tst_QGeoAreaMonitorSource : public QObject
diff --git a/tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp b/tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp
index c9eab14a..21417f84 100644
--- a/tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp
+++ b/tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp
@@ -53,6 +53,7 @@
 
 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 2519b512..86435448 100644
--- a/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp
+++ b/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp
@@ -58,6 +58,7 @@
 
 Q_DECLARE_METATYPE(QGeoPositionInfoSource::PositioningMethod)
 Q_DECLARE_METATYPE(QGeoPositionInfoSource::PositioningMethods)
+Q_DECLARE_METATYPE(QGeoPositionInfo)
 
 #define MAX_WAITING_TIME 50000
 
diff --git a/tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp b/tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp
index e95df7e4..69f04762 100644
--- a/tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp
+++ b/tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp
@@ -52,6 +52,7 @@
 #include <limits.h>
 
 QT_USE_NAMESPACE
+Q_DECLARE_METATYPE(QGeoSatelliteInfo)
 Q_DECLARE_METATYPE(QGeoSatelliteInfo::Attribute)
 
 QByteArray tst_qgeosatelliteinfo_debug;
diff --git a/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp b/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp
index 3d434a9f..ce83b196 100644
--- a/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp
+++ b/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp
@@ -50,6 +50,7 @@
 #include <QTest>
 
 Q_DECLARE_METATYPE(QNmeaPositionInfoSource::UpdateMode)
+Q_DECLARE_METATYPE(QGeoPositionInfo)
 
 class DummyNmeaPositionInfoSource : public QNmeaPositionInfoSource
 {
diff --git a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h
index 052ea28a..d541465d 100644
--- a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h
+++ b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h
@@ -58,6 +58,7 @@
 
 QT_USE_NAMESPACE
 Q_DECLARE_METATYPE(QNmeaPositionInfoSource::UpdateMode)
+Q_DECLARE_METATYPE(QGeoPositionInfo)
 Q_DECLARE_METATYPE(QList<QDateTime>)
 
 class tst_QNmeaPositionInfoSource : public QObject