diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-01 12:46:11 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-01 12:46:11 +0200 |
commit | 73c44bc93acbc821f5389900393bfe29e449e969 (patch) | |
tree | aec750e14ea274fd13d93a88ac3367dda6de6ee2 /src | |
parent | 9ec6d950bc8f3694c6f39ca5cd09fe27737df798 (diff) | |
parent | b1f1e727c5617d1e4e9878415ea2905fe9f8cb18 (diff) |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Ic93dff7bb023fa16e9b54894909066c4a7281fc0
Diffstat (limited to 'src')
-rw-r--r-- | src/enginio_plugin/doc/qtenginioqml.qdocconf | 3 | ||||
-rw-r--r-- | src/enginio_plugin/plugins.qmltypes | 15 |
2 files changed, 17 insertions, 1 deletions
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" } |