Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable

3 files changed, 40 insertions, 1 deletions

diff --git a/dist/changes-1.0.4 b/dist/changes-1.0.4
new file mode 100644
index 0000000..4bba5e5
--- /dev/null
+++ b/dist/changes-1.0.4
@@ -0,0 +1,23 @@
+Enginio 1.0.4 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Enginio 1.0.0, 1.0.1 and 1.0.2.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+    http://qt-project.org/doc/qt-5/
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+    http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+ - Mark EnginioClientConnection::serviceUrl as public property
+ - Several documentation and example improvements
diff --git a/src/enginio_plugin/doc/qtenginioqml.qdocconf b/src/enginio_plugin/doc/qtenginioqml.qdocconf
index 135782a..bd7b333 100644
--- a/src/enginio_plugin/doc/qtenginioqml.qdocconf
+++ b/src/enginio_plugin/doc/qtenginioqml.qdocconf
@@ -25,6 +25,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/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" }