Fixes for tests.

More fixes for the final Qt 5 release

Change-Id: I5a267e1ab75a976ed6b6f7923a933de6eab90be7
Reviewed-by: Chris Craig <craig@ics.com>

4 files changed, 10 insertions, 4 deletions

diff --git a/src/jsonstream/qjsonconnection.cpp b/src/jsonstream/qjsonconnection.cpp
index cc48d58..1a63559 100644
--- a/src/jsonstream/qjsonconnection.cpp
+++ b/src/jsonstream/qjsonconnection.cpp
@@ -133,7 +133,7 @@ QJsonConnection::QJsonConnection(QObject *parent)
     connect(d->mProcessor, SIGNAL(disconnected()), SIGNAL(disconnected()));
     qRegisterMetaType<QJsonConnection::State>("QJsonConnection::State");
     connect(d->mProcessor, SIGNAL(stateChanged(QJsonConnection::State)), SIGNAL(stateChanged(QJsonConnection::State)));
-    qRegisterMetaType<QJsonConnection::State>("QJsonConnection::Error");
+    qRegisterMetaType<QJsonConnection::Error>("QJsonConnection::Error");
     connect(d->mProcessor, SIGNAL(error(QJsonConnection::Error,int,QString)), SLOT(handleError(QJsonConnection::Error,int,QString)));
 }
 
diff --git a/src/jsonstream/qjsonconnection.h b/src/jsonstream/qjsonconnection.h
index 844d8b0..506be26 100644
--- a/src/jsonstream/qjsonconnection.h
+++ b/src/jsonstream/qjsonconnection.h
@@ -146,4 +146,7 @@ private:
 
 QT_END_NAMESPACE_JSONSTREAM
 
+Q_DECLARE_METATYPE(::QtAddOn::QtJsonStream::QJsonConnection::State)
+Q_DECLARE_METATYPE(::QtAddOn::QtJsonStream::QJsonConnection::Error)
+
 #endif // _JSON_CONNECTION_H
diff --git a/tests/auto/jsonconnection/testClient/testClient.pro b/tests/auto/jsonconnection/testClient/testClient.pro
index a053251..3a9e4b3 100644
--- a/tests/auto/jsonconnection/testClient/testClient.pro
+++ b/tests/auto/jsonconnection/testClient/testClient.pro
@@ -3,3 +3,5 @@ QT += testlib jsonstream
 
 SOURCES = main.cpp
 TARGET  = testClient
+
+DEFINES += QT_FORCE_ASSERTS
diff --git a/tests/auto/jsonconnection/tst_jsonconnection.cpp b/tests/auto/jsonconnection/tst_jsonconnection.cpp
index 6e6a8eb..8f700c9 100644
--- a/tests/auto/jsonconnection/tst_jsonconnection.cpp
+++ b/tests/auto/jsonconnection/tst_jsonconnection.cpp
@@ -52,9 +52,6 @@
 
 QT_USE_NAMESPACE_JSONSTREAM
 
-Q_DECLARE_METATYPE(QJsonObject);
-Q_DECLARE_METATYPE(QJsonConnection::State);
-
 void waitForSpy(QSignalSpy& spy, int count, int timeout=5000) {
     QTime stopWatch;
     stopWatch.restart();
@@ -317,6 +314,8 @@ private:
 void tst_JsonConnection::initTestCase()
 {
     qRegisterMetaType<QJsonObject>();
+    qRegisterMetaType<QJsonConnection::State>("QJsonConnection::State");
+    qRegisterMetaType<QJsonConnection::Error>("QJsonConnection::Error");
     registerQmlTypes();
 }
 
@@ -425,6 +424,8 @@ signals:
 
 void tst_JsonConnection::registerQmlTypes()
 {
+    qRegisterMetaType<QJsonConnection*>("QJsonConnection*");
+    qRegisterMetaType<QJsonEndpoint*>("QJsonEndpoint*");
     qmlRegisterType<QJsonConnection>("Qt.json.connection.test", 1,0, "JsonConnection");
     qmlRegisterType<QJsonEndpoint>("Qt.json.connection.test", 1,0, "JsonEndpoint");
 }