diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/enginio_client/enginioclient.cpp | 2 | ||||
| -rw-r--r-- | src/enginio_client/enginioreply.cpp | 2 | ||||
| -rw-r--r-- | src/enginio_plugin/enginio_plugin.pro | 2 | ||||
| -rw-r--r-- | src/enginio_plugin/enginioplugin.cpp | 2 | ||||
| -rw-r--r-- | src/enginio_plugin/enginioqmlclient.cpp | 2 | ||||
| -rw-r--r-- | src/enginio_plugin/enginioqmlreply.cpp | 2 | ||||
| -rw-r--r-- | src/enginio_plugin/plugins.qmltypes | 282 | ||||
| -rw-r--r-- | sync.profile | 6 |
9 files changed, 291 insertions, 11 deletions
diff --git a/.qmake.conf b/.qmake.conf index daabc79..0344472 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += warning_clean CONFIG += qt_example_installs -MODULE_VERSION = 1.2.1 +MODULE_VERSION = 1.6.0 diff --git a/src/enginio_client/enginioclient.cpp b/src/enginio_client/enginioclient.cpp index 8eb2fee..4302285 100644 --- a/src/enginio_client/enginioclient.cpp +++ b/src/enginio_client/enginioclient.cpp @@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE \since 5.3 \inmodule enginio-qt \ingroup enginio-client - \target EnginioClientCpp + \keyword EnginioClientCpp \brief EnginioClient handles all communication with the Enginio server The Enginio server supports several separate "backends" with each account. diff --git a/src/enginio_client/enginioreply.cpp b/src/enginio_client/enginioreply.cpp index 60a15fa..6e0c8ac 100644 --- a/src/enginio_client/enginioreply.cpp +++ b/src/enginio_client/enginioreply.cpp @@ -324,7 +324,7 @@ QDebug operator<<(QDebug d, const EnginioReply *reply) return d; } d.nospace(); - d << "EnginioReply(" << hex << (void *) reply << dec; + d << "EnginioReply(" << hex << (const void *) reply << dec; if (!reply->isError()) { d << " success data=" << reply->data(); diff --git a/src/enginio_plugin/enginio_plugin.pro b/src/enginio_plugin/enginio_plugin.pro index 89fa978..728313f 100644 --- a/src/enginio_plugin/enginio_plugin.pro +++ b/src/enginio_plugin/enginio_plugin.pro @@ -2,6 +2,8 @@ requires(qtHaveModule(qml)) TARGETPATH = Enginio +IMPORT_VERSION = 1.0 + QT = qml enginio enginio-private core-private QMAKE_DOCS = $$PWD/doc/qtenginioqml.qdocconf diff --git a/src/enginio_plugin/enginioplugin.cpp b/src/enginio_plugin/enginioplugin.cpp index 1fd2b7f..bf20f1f 100644 --- a/src/enginio_plugin/enginioplugin.cpp +++ b/src/enginio_plugin/enginioplugin.cpp @@ -88,7 +88,7 @@ void EnginioPlugin::initializeEngine(QQmlEngine *engine, const char *uri) \instantiates EnginioOAuth2Authentication \inqmlmodule Enginio \ingroup engino-qml - \target EnginioOAuth2AuthenticationQml + \keyword EnginioOAuth2AuthenticationQml \brief Represents a user that is authenticated directly by the backend using OAuth2 standard. This component can authenticate a user by verifying the user's login and password. diff --git a/src/enginio_plugin/enginioqmlclient.cpp b/src/enginio_plugin/enginioqmlclient.cpp index 4a229cd..917d23a 100644 --- a/src/enginio_plugin/enginioqmlclient.cpp +++ b/src/enginio_plugin/enginioqmlclient.cpp @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE \instantiates EnginioQmlClient \inqmlmodule Enginio \ingroup engino-qml - \target EnginioClientQml + \keyword EnginioClientQml \brief Client interface to access Enginio service \snippet simple.qml import diff --git a/src/enginio_plugin/enginioqmlreply.cpp b/src/enginio_plugin/enginioqmlreply.cpp index ab134d1..5195de2 100644 --- a/src/enginio_plugin/enginioqmlreply.cpp +++ b/src/enginio_plugin/enginioqmlreply.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE \instantiates EnginioQmlReply \inqmlmodule Enginio \ingroup engino-qml - \target EnginioModelQml + \keyword EnginioModelQml \brief A reply to any Enginio request. diff --git a/src/enginio_plugin/plugins.qmltypes b/src/enginio_plugin/plugins.qmltypes index 5ad616b..765bf4d 100644 --- a/src/enginio_plugin/plugins.qmltypes +++ b/src/enginio_plugin/plugins.qmltypes @@ -1,12 +1,13 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -notrelocatable Enginio 1.0' +// 'qmlplugindump -nonrelocatable Enginio 1.0' Module { + dependencies: [] Component { name: "Enginio" exports: ["Enginio/Enginio 1.0"] @@ -45,6 +46,7 @@ Module { "UpdatedAtRole": 259, "IdRole": 260, "ObjectTypeRole": 261, + "JsonObjectRole": 262, "CustomPropertyRole": 266 } } @@ -245,6 +247,7 @@ Module { Parameter { name: "role"; type: "string" } Parameter { name: "value"; type: "QVariant" } } + Method { name: "reload"; type: "EnginioQmlReply*" } } Component { name: "EnginioQmlReply" @@ -280,6 +283,271 @@ Module { Method { name: "dumpDebugInfo" } } Component { + name: "QAbstractItemModel" + prototype: "QObject" + Enum { + name: "LayoutChangeHint" + values: { + "NoLayoutChangeHint": 0, + "VerticalSortHint": 1, + "HorizontalSortHint": 2 + } + } + Signal { + name: "dataChanged" + Parameter { name: "topLeft"; type: "QModelIndex" } + Parameter { name: "bottomRight"; type: "QModelIndex" } + Parameter { name: "roles"; type: "QVector<int>" } + } + Signal { + name: "dataChanged" + Parameter { name: "topLeft"; type: "QModelIndex" } + Parameter { name: "bottomRight"; type: "QModelIndex" } + } + Signal { + name: "headerDataChanged" + Parameter { name: "orientation"; type: "Qt::Orientation" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "layoutChanged" + Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" } + Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" } + } + Signal { + name: "layoutChanged" + Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" } + } + Signal { name: "layoutChanged" } + Signal { + name: "layoutAboutToBeChanged" + Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" } + Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" } + } + Signal { + name: "layoutAboutToBeChanged" + Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" } + } + Signal { name: "layoutAboutToBeChanged" } + Signal { + name: "rowsAboutToBeInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "rowsInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "rowsAboutToBeRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "rowsRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsAboutToBeInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsInserted" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsAboutToBeRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { + name: "columnsRemoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "first"; type: "int" } + Parameter { name: "last"; type: "int" } + } + Signal { name: "modelAboutToBeReset" } + Signal { name: "modelReset" } + Signal { + name: "rowsAboutToBeMoved" + Parameter { name: "sourceParent"; type: "QModelIndex" } + Parameter { name: "sourceStart"; type: "int" } + Parameter { name: "sourceEnd"; type: "int" } + Parameter { name: "destinationParent"; type: "QModelIndex" } + Parameter { name: "destinationRow"; type: "int" } + } + Signal { + name: "rowsMoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + Parameter { name: "destination"; type: "QModelIndex" } + Parameter { name: "row"; type: "int" } + } + Signal { + name: "columnsAboutToBeMoved" + Parameter { name: "sourceParent"; type: "QModelIndex" } + Parameter { name: "sourceStart"; type: "int" } + Parameter { name: "sourceEnd"; type: "int" } + Parameter { name: "destinationParent"; type: "QModelIndex" } + Parameter { name: "destinationColumn"; type: "int" } + } + Signal { + name: "columnsMoved" + Parameter { name: "parent"; type: "QModelIndex" } + Parameter { name: "start"; type: "int" } + Parameter { name: "end"; type: "int" } + Parameter { name: "destination"; type: "QModelIndex" } + Parameter { name: "column"; type: "int" } + } + Method { name: "submit"; type: "bool" } + Method { name: "revert" } + Method { + name: "hasIndex" + type: "bool" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "hasIndex" + type: "bool" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + } + Method { + name: "index" + type: "QModelIndex" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "index" + type: "QModelIndex" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + } + Method { + name: "parent" + type: "QModelIndex" + Parameter { name: "child"; type: "QModelIndex" } + } + Method { + name: "sibling" + type: "QModelIndex" + Parameter { name: "row"; type: "int" } + Parameter { name: "column"; type: "int" } + Parameter { name: "idx"; type: "QModelIndex" } + } + Method { + name: "rowCount" + type: "int" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { name: "rowCount"; type: "int" } + Method { + name: "columnCount" + type: "int" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { name: "columnCount"; type: "int" } + Method { + name: "hasChildren" + type: "bool" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { name: "hasChildren"; type: "bool" } + Method { + name: "data" + type: "QVariant" + Parameter { name: "index"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + } + Method { + name: "data" + type: "QVariant" + Parameter { name: "index"; type: "QModelIndex" } + } + Method { + name: "setData" + type: "bool" + Parameter { name: "index"; type: "QModelIndex" } + Parameter { name: "value"; type: "QVariant" } + Parameter { name: "role"; type: "int" } + } + Method { + name: "setData" + type: "bool" + Parameter { name: "index"; type: "QModelIndex" } + Parameter { name: "value"; type: "QVariant" } + } + Method { + name: "headerData" + type: "QVariant" + Parameter { name: "section"; type: "int" } + Parameter { name: "orientation"; type: "Qt::Orientation" } + Parameter { name: "role"; type: "int" } + } + Method { + name: "headerData" + type: "QVariant" + Parameter { name: "section"; type: "int" } + Parameter { name: "orientation"; type: "Qt::Orientation" } + } + Method { + name: "fetchMore" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "canFetchMore" + type: "bool" + Parameter { name: "parent"; type: "QModelIndex" } + } + Method { + name: "flags" + type: "Qt::ItemFlags" + Parameter { name: "index"; type: "QModelIndex" } + } + Method { + name: "match" + type: "QModelIndexList" + Parameter { name: "start"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + Parameter { name: "value"; type: "QVariant" } + Parameter { name: "hits"; type: "int" } + Parameter { name: "flags"; type: "Qt::MatchFlags" } + } + Method { + name: "match" + type: "QModelIndexList" + Parameter { name: "start"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + Parameter { name: "value"; type: "QVariant" } + Parameter { name: "hits"; type: "int" } + } + Method { + name: "match" + type: "QModelIndexList" + Parameter { name: "start"; type: "QModelIndex" } + Parameter { name: "role"; type: "int" } + Parameter { name: "value"; type: "QVariant" } + } + } + Component { name: "QAbstractListModel"; prototype: "QAbstractItemModel" } + Component { name: "QIODevice" prototype: "QObject" Signal { name: "readyRead" } @@ -309,6 +577,8 @@ Module { "TemporaryNetworkFailureError": 7, "NetworkSessionFailedError": 8, "BackgroundRequestNotAllowedError": 9, + "TooManyRedirectsError": 10, + "InsecureRedirectError": 11, "UnknownNetworkError": 99, "ProxyConnectionRefusedError": 101, "ProxyConnectionClosedError": 102, @@ -345,6 +615,14 @@ Module { Parameter { name: "errors"; type: "QList<QSslError>" } } Signal { + name: "preSharedKeyAuthenticationRequired" + Parameter { name: "authenticator"; type: "QSslPreSharedKeyAuthenticator"; isPointer: true } + } + Signal { + name: "redirected" + Parameter { name: "url"; type: "QUrl" } + } + Signal { name: "uploadProgress" Parameter { name: "bytesSent"; type: "qlonglong" } Parameter { name: "bytesTotal"; type: "qlonglong" } diff --git a/sync.profile b/sync.profile index e64033e..8e2728b 100644 --- a/sync.profile +++ b/sync.profile @@ -11,8 +11,8 @@ # - an empty string to use the same branch under test (dependencies will become "refs/heads/master" if we are in the master branch) # %dependencies = ( - "qtbase" => "refs/heads/5.5", - "qtdeclarative" => "refs/heads/5.5", - "qtxmlpatterns" => "refs/heads/5.5", + "qtbase" => "", + "qtdeclarative" => "", + "qtxmlpatterns" => "", ); |