Merge remote-tracking branch 'gerrit/master' into hbtreehbtree

Conflicts:
	src/daemon/daemon.pri
	src/daemon/jsondbview.cpp
	src/partition/jsondbindex.cpp
	src/partition/jsondbindex.h
	src/partition/jsondbindexquery.h
	src/partition/jsondbmanagedbtree.cpp
	src/partition/jsondbmanagedbtree.h
	src/partition/jsondbmanagedbtreetxn.cpp
	src/partition/jsondbmanagedbtreetxn.h
	src/partition/jsondbobjecttable.cpp
	src/partition/jsondbobjecttable.h
	src/partition/jsondbpartition.cpp
	src/partition/jsondbpartition.h
	tests/auto/auto.pro
	tests/auto/partition/testpartition.cpp
	tests/benchmarks/benchmarks.pro

Change-Id: I963adefd6d32fca9b3537981306b67538c759034

1 files changed, 8 insertions, 7 deletions

diff --git a/tests/auto/jsonstream/test-jsonstream.cpp b/tests/auto/jsonstream/test-jsonstream.cpp
index 4eac182..1563924 100644
--- a/tests/auto/jsonstream/test-jsonstream.cpp
+++ b/tests/auto/jsonstream/test-jsonstream.cpp
@@ -40,14 +40,15 @@
 ****************************************************************************/
 #include <QtTest/QtTest>
 
-#include <jsonstream.h>
+#include "jsonstream.h"
+
 #include <QLocalServer>
 #include <QLocalSocket>
 #include <QBuffer>
 
 #include <QDebug>
 
-QT_ADDON_JSONDB_USE_NAMESPACE
+using QtJsonDbJsonStream::JsonStream;
 
 class TestJsonStream: public QObject
 {
@@ -81,10 +82,9 @@ void TestJsonStream::testJsonStream()
     QVERIFY(device->waitForConnected());
     QVERIFY(device->state() == QLocalSocket::ConnectedState);
 
-    JsonStream *stream = new JsonStream(device, this);
-
-    connect(stream, SIGNAL(receive(QJsonObject)),
-                this, SLOT(receiveStream(QJsonObject)));
+    JsonStream *stream = new JsonStream(this);
+    stream->setDevice(device);
+    connect(stream, SIGNAL(receive(QJsonObject)), this, SLOT(receiveStream(QJsonObject)));
 
     qApp->processEvents();
     qApp->processEvents();
@@ -99,7 +99,8 @@ void TestJsonStream::handleSocketConnection()
 {
     qDebug() << "handleSocketConnection";
     serverOk = true;
-    JsonStream sender(server->nextPendingConnection());
+    JsonStream sender;
+    sender.setDevice(server->nextPendingConnection());
 
     QJsonObject json1;
     json1.insert("hello", QString("world"));