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, 13 insertions, 2 deletions

diff --git a/src/jsonstream/jsonstream.h b/src/jsonstream/jsonstream.h
index f76020f..8eceab0 100644
--- a/src/jsonstream/jsonstream.h
+++ b/src/jsonstream/jsonstream.h
@@ -42,6 +42,17 @@
 #ifndef JSON_STREAM_H
 #define JSON_STREAM_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the QtJsonDb API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QObject>
 #include <QJsonObject>
 
@@ -49,7 +60,7 @@ QT_BEGIN_NAMESPACE
 
 class QIODevice;
 
-namespace JsonStream {
+namespace QtJsonDbJsonStream {
 
 class JsonStream : public QObject
 {
@@ -76,7 +87,7 @@ private:
     QByteArray mReadBuffer;
 };
 
-} // namespace JsonStream
+} // namespace QtJsonDbJsonStream
 
 QT_END_NAMESPACE