Merge remote-tracking branch 'origin/1.0' into dev

Conflicts:
	.qmake.conf

Change-Id: I98fec4d0cd8110549d6efc00112678e076781ed4

13 files changed, 50 insertions, 20 deletions

diff --git a/src/enginio_client/doc/enginio_client.qdoc b/src/enginio_client/doc/enginio_client.qdoc
index fb77b4f..bdd492f 100644
--- a/src/enginio_client/doc/enginio_client.qdoc
+++ b/src/enginio_client/doc/enginio_client.qdoc
@@ -31,7 +31,11 @@
 \inmodule enginio-qt
 \ingroup modules
 
-Enginio provides these \b{C++ classes}:
+\section1 Namespaces
+
+\annotatedlist enginio-namespace
+
+\section1 Classes
 \generatelist {classesbymodule enginio-qt}
 
 List of examples:
diff --git a/src/enginio_client/enginio_client.pro b/src/enginio_client/enginio_client.pro
index 34cb84d..f3a158d 100644
--- a/src/enginio_client/enginio_client.pro
+++ b/src/enginio_client/enginio_client.pro
@@ -43,3 +43,5 @@ HEADERS += \
     enginiooauth2authentication.h \
     enginioreplystate.h
 
+
+DEFINES +=  "ENGINIO_VERSION=\\\"$$MODULE_VERSION\\\""
diff --git a/src/enginio_client/enginiobackendconnection.cpp b/src/enginio_client/enginiobackendconnection.cpp
index f3b0b68..3e375f3 100644
--- a/src/enginio_client/enginiobackendconnection.cpp
+++ b/src/enginio_client/enginiobackendconnection.cpp
@@ -54,6 +54,7 @@
 #include <QtCore/qstring.h>
 #include <QtCore/quuid.h>
 #include <QtNetwork/qtcpsocket.h>
+#include <QtCore/qdebug.h>
 
 #define CRLF QLatin1String("\r\n")
 
diff --git a/src/enginio_client/enginioclient.cpp b/src/enginio_client/enginioclient.cpp
index 3fe1536..6a47696 100644
--- a/src/enginio_client/enginioclient.cpp
+++ b/src/enginio_client/enginioclient.cpp
@@ -116,6 +116,7 @@ QT_BEGIN_NAMESPACE
 /*!
   \namespace Enginio
   \inmodule enginio-qt
+  \ingroup enginio-namespace
   \brief The Enginio namespace provides enums used throughout Enginio.
 */
 
@@ -285,6 +286,8 @@ void EnginioClientConnectionPrivate::init()
     QObject::connect(static_cast<EnginioClient*>(q_ptr), &EnginioClient::sessionTerminated, AuthenticationStateTrackerFunctor(this));
     QObject::connect(static_cast<EnginioClient*>(q_ptr), &EnginioClient::sessionAuthenticated, AuthenticationStateTrackerFunctor(this, Enginio::Authenticated));
     QObject::connect(static_cast<EnginioClient*>(q_ptr), &EnginioClient::sessionAuthenticationError, AuthenticationStateTrackerFunctor(this, Enginio::AuthenticationFailure));
+    _request.setHeader(QNetworkRequest::UserAgentHeader,
+                          QByteArrayLiteral("Qt:" QT_VERSION_STR " Enginio:" ENGINIO_VERSION " Language:C++"));
 }
 
 void EnginioClientConnectionPrivate::replyFinished(QNetworkReply *nreply)
@@ -416,19 +419,13 @@ void EnginioClientConnection::setBackendId(const QByteArray &backendId)
 /*!
   \property EnginioClientConnection::serviceUrl
   \brief Enginio backend URL.
-  \internal
 
   The API URL determines the server used by Enginio.
-  Usually it is not needed to change the default URL.
-*/
-
-/*!
-  \fn EnginioClientConnection::serviceUrlChanged(const QUrl &url)
-  \internal
-*/
 
-/*!
-  \internal
+  Usually it is not needed to change the default URL, but if it has
+  to be changed it should be done as a first operaion on this
+  EnginioClientConnection, otherwise some request may be sent accidentally
+  to the default url.
 */
 QUrl EnginioClientConnection::serviceUrl() const
 {
@@ -436,9 +433,6 @@ QUrl EnginioClientConnection::serviceUrl() const
     return d->_serviceUrl;
 }
 
-/*!
-    \internal
-*/
 void EnginioClientConnection::setServiceUrl(const QUrl &serviceUrl)
 {
     Q_D(EnginioClientConnection);
diff --git a/src/enginio_client/enginioclient_global.h b/src/enginio_client/enginioclient_global.h
index 66057bd..e81914a 100644
--- a/src/enginio_client/enginioclient_global.h
+++ b/src/enginio_client/enginioclient_global.h
@@ -43,12 +43,15 @@
 #define ENGINIOCLIENT_GLOBAL_H
 
 #include <QtCore/qglobal.h>
-#include <QDebug>
 
-#if defined(ENGINIOCLIENT_LIBRARY)
-#  define ENGINIOCLIENT_EXPORT Q_DECL_EXPORT
+#if defined(QT_SHARED) || !defined(QT_STATIC)
+#  if defined(ENGINIOCLIENT_LIBRARY)
+#    define ENGINIOCLIENT_EXPORT Q_DECL_EXPORT
+#  else
+#    define ENGINIOCLIENT_EXPORT Q_DECL_IMPORT
+#  endif
 #else
-#  define ENGINIOCLIENT_EXPORT Q_DECL_IMPORT
+#  define ENGINIOCLIENT_EXPORT
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/enginio_client/enginioclient_p.h b/src/enginio_client/enginioclient_p.h
index 41bc846..93ce864 100644
--- a/src/enginio_client/enginioclient_p.h
+++ b/src/enginio_client/enginioclient_p.h
@@ -63,6 +63,9 @@
 #include <QtCore/qbuffer.h>
 #include <QtCore/qlinkedlist.h>
 #include <QtCore/quuid.h>
+#include <QtCore/qset.h>
+#include <QtCore/qlogging.h>
+#include <QtCore/qdebug.h>
 
 #include <QtCore/private/qobject_p.h>
 
diff --git a/src/enginio_client/enginioreply.cpp b/src/enginio_client/enginioreply.cpp
index b4b8af6..3e5cfdd 100644
--- a/src/enginio_client/enginioreply.cpp
+++ b/src/enginio_client/enginioreply.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 
+#include <QtCore/qdebug.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qjsonobject.h>
 #include <QtCore/qjsondocument.h>
@@ -344,6 +345,7 @@ QDebug operator<<(QDebug d, const EnginioReply *reply)
     d << ")";
     return d.space();
 }
+#endif // QT_NO_DEBUG_STREAM
 
 EnginioReplyState::EnginioReplyState(EnginioClientConnectionPrivate *parent, QNetworkReply *reply, EnginioReplyStatePrivate *priv)
     : QObject(*priv, parent->q_ptr)
@@ -374,4 +376,3 @@ QJsonObject EnginioReplyState::data() const
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_DEBUG_STREAM
diff --git a/src/enginio_client/enginioreply.h b/src/enginio_client/enginioreply.h
index 7855e9e..bb743b2 100644
--- a/src/enginio_client/enginioreply.h
+++ b/src/enginio_client/enginioreply.h
@@ -103,6 +103,7 @@ private:
 Q_DECLARE_TYPEINFO(const EnginioReply*, Q_PRIMITIVE_TYPE);
 
 #ifndef QT_NO_DEBUG_STREAM
+class QDebug;
 ENGINIOCLIENT_EXPORT QDebug operator<<(QDebug d, const EnginioReply *reply);
 #endif
 
diff --git a/src/enginio_client/enginioreply_p.h b/src/enginio_client/enginioreply_p.h
index db3b029..70199a2 100644
--- a/src/enginio_client/enginioreply_p.h
+++ b/src/enginio_client/enginioreply_p.h
@@ -42,6 +42,7 @@
 #ifndef ENGINIOREPLY_P_H
 #define ENGINIOREPLY_P_H
 
+#include <QtCore/qdebug.h>
 #include <QtCore/qhash.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qbytearray.h>
diff --git a/src/enginio_plugin/doc/qtenginioqml.qdocconf b/src/enginio_plugin/doc/qtenginioqml.qdocconf
index a2e85e7..7546037 100644
--- a/src/enginio_plugin/doc/qtenginioqml.qdocconf
+++ b/src/enginio_plugin/doc/qtenginioqml.qdocconf
@@ -24,6 +24,9 @@ exampledirs += \
 # Specify example install dir under QT_INSTALL_EXAMPLES
 examplesinstallpath = enginio/quick
 
+# Add highlighting for QML Todo example
+manifestmeta.highlighted.names += "QtEnginioQml/Enginio QML Examples - Todos"
+
 depends += qtcore qtgui qtnetwork qtqml qtquick qtquickcontrols qtenginio qtenginiooverview
 
 qhp.projects            = QtEnginioQml
diff --git a/src/enginio_plugin/enginio_plugin.pro b/src/enginio_plugin/enginio_plugin.pro
index 2d9f5c6..89fa978 100644
--- a/src/enginio_plugin/enginio_plugin.pro
+++ b/src/enginio_plugin/enginio_plugin.pro
@@ -41,3 +41,5 @@ copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
 copy2build.name = COPY ${QMAKE_FILE_IN}
 copy2build.CONFIG += no_link
 force_independent: QMAKE_EXTRA_COMPILERS += copy2build
+
+DEFINES +=  "ENGINIO_VERSION=\\\"$$MODULE_VERSION\\\""
diff --git a/src/enginio_plugin/enginioqmlclient.cpp b/src/enginio_plugin/enginioqmlclient.cpp
index 7c29cd2..9e97e3f 100644
--- a/src/enginio_plugin/enginioqmlclient.cpp
+++ b/src/enginio_plugin/enginioqmlclient.cpp
@@ -284,6 +284,8 @@ void EnginioQmlClientPrivate::init()
     QObject::connect(q, &EnginioQmlClient::sessionTerminated, AuthenticationStateTrackerFunctor(this));
     QObject::connect(q, &EnginioQmlClient::sessionAuthenticated, AuthenticationStateTrackerFunctor(this, Enginio::Authenticated));
     QObject::connect(q, &EnginioQmlClient::sessionAuthenticationError, AuthenticationStateTrackerFunctor(this, Enginio::AuthenticationFailure));
+    _request.setHeader(QNetworkRequest::UserAgentHeader,
+                          QByteArrayLiteral("Qt:" QT_VERSION_STR " Enginio:" ENGINIO_VERSION " Language:QML"));
 }
 
 EnginioQmlReply *EnginioQmlClient::fullTextSearch(const QJSValue &query)
diff --git a/src/enginio_plugin/plugins.qmltypes b/src/enginio_plugin/plugins.qmltypes
index ab7a8b2..5ad616b 100644
--- a/src/enginio_plugin/plugins.qmltypes
+++ b/src/enginio_plugin/plugins.qmltypes
@@ -10,6 +10,7 @@ Module {
     Component {
         name: "Enginio"
         exports: ["Enginio/Enginio 1.0"]
+        isCreatable: false
         exportMetaObjectRevisions: [0]
         Enum {
             name: "AuthenticationState"
@@ -60,12 +61,14 @@ Module {
         name: "EnginioBaseModel"
         prototype: "QAbstractListModel"
         exports: ["Enginio/EnginioBaseModel 1.0"]
+        isCreatable: false
         exportMetaObjectRevisions: [0]
     }
     Component {
         name: "EnginioClientConnection"
         prototype: "QObject"
         exports: ["Enginio/EnginioClientConnection 1.0"]
+        isCreatable: false
         exportMetaObjectRevisions: [0]
         Property { name: "backendId"; type: "QByteArray" }
         Property { name: "serviceUrl"; type: "QUrl" }
@@ -92,6 +95,7 @@ Module {
         name: "EnginioIdentity"
         prototype: "QObject"
         exports: ["Enginio/EnginioIdentity 1.0"]
+        isCreatable: false
         exportMetaObjectRevisions: [0]
         Signal { name: "dataChanged" }
         Signal { name: "aboutToDestroy" }
@@ -246,6 +250,7 @@ Module {
         name: "EnginioQmlReply"
         prototype: "EnginioReplyState"
         exports: ["Enginio/EnginioReply 1.0"]
+        isCreatable: false
         exportMetaObjectRevisions: [0]
         Property { name: "data"; type: "QJSValue"; isReadonly: true }
         Property { name: "isError"; type: "bool"; isReadonly: true }
@@ -259,6 +264,7 @@ Module {
         name: "EnginioReplyState"
         prototype: "QObject"
         exports: ["Enginio/EnginioReplyState 1.0"]
+        isCreatable: false
         exportMetaObjectRevisions: [0]
         Property { name: "errorType"; type: "Enginio::ErrorType"; isReadonly: true }
         Property { name: "networkError"; type: "QNetworkReply::NetworkError"; isReadonly: true }
@@ -288,6 +294,7 @@ Module {
         name: "QNetworkReply"
         prototype: "QIODevice"
         exports: ["Enginio/QNetworkReply 1.0"]
+        isCreatable: false
         exportMetaObjectRevisions: [0]
         Enum {
             name: "NetworkError"
@@ -314,10 +321,16 @@ Module {
                 "ContentNotFoundError": 203,
                 "AuthenticationRequiredError": 204,
                 "ContentReSendError": 205,
+                "ContentConflictError": 206,
+                "ContentGoneError": 207,
                 "UnknownContentError": 299,
                 "ProtocolUnknownError": 301,
                 "ProtocolInvalidOperationError": 302,
-                "ProtocolFailure": 399
+                "ProtocolFailure": 399,
+                "InternalServerError": 401,
+                "OperationNotImplementedError": 402,
+                "ServiceUnavailableError": 403,
+                "UnknownServerError": 499
             }
         }
         Signal { name: "metaDataChanged" }