diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/imports/compat/plugins.qmltypes | 5 | ||||
| -rw-r--r-- | src/imports/remoteobjects/plugins.qmltypes | 7 | ||||
| -rw-r--r-- | src/imports/remoteobjects/remoteobjects.pro | 2 | ||||
| -rw-r--r-- | src/remoteobjects/doc/src/remoteobjects-qml.qdoc | 14 |
5 files changed, 16 insertions, 14 deletions
diff --git a/.qmake.conf b/.qmake.conf index b237680..456940b 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,6 +1,6 @@ load(qt_build_config) CONFIG += qt_example_installs -MODULE_VERSION = 5.12.2 +MODULE_VERSION = 5.13.0 QTRO_SOURCE_TREE = $$PWD diff --git a/src/imports/compat/plugins.qmltypes b/src/imports/compat/plugins.qmltypes index 4839d3a..2439715 100644 --- a/src/imports/compat/plugins.qmltypes +++ b/src/imports/compat/plugins.qmltypes @@ -7,7 +7,7 @@ import QtQuick.tooling 1.2 // 'qmlplugindump -nonrelocatable QtQml.RemoteObjects 1.0' Module { - dependencies: ["QtQuick 2.8"] + dependencies: ["QtQuick 2.0"] Component { name: "QRemoteObjectAbstractPersistedStore" prototype: "QObject" @@ -33,7 +33,8 @@ Module { "SourceNotRegistered": 7, "MissingObjectName": 8, "HostUrlInvalid": 9, - "ProtocolMismatch": 10 + "ProtocolMismatch": 10, + "ListenFailed": 11 } } Property { name: "registryUrl"; type: "QUrl" } diff --git a/src/imports/remoteobjects/plugins.qmltypes b/src/imports/remoteobjects/plugins.qmltypes index 3891b4a..1a31afa 100644 --- a/src/imports/remoteobjects/plugins.qmltypes +++ b/src/imports/remoteobjects/plugins.qmltypes @@ -4,10 +4,10 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtRemoteObjects 5.12' +// 'qmlplugindump -nonrelocatable QtRemoteObjects 5.13' Module { - dependencies: ["QtQuick 2.8"] + dependencies: ["QtQuick 2.0"] Component { name: "QRemoteObjectAbstractPersistedStore" prototype: "QObject" @@ -33,7 +33,8 @@ Module { "SourceNotRegistered": 7, "MissingObjectName": 8, "HostUrlInvalid": 9, - "ProtocolMismatch": 10 + "ProtocolMismatch": 10, + "ListenFailed": 11 } } Property { name: "registryUrl"; type: "QUrl" } diff --git a/src/imports/remoteobjects/remoteobjects.pro b/src/imports/remoteobjects/remoteobjects.pro index a902780..ed21fa6 100644 --- a/src/imports/remoteobjects/remoteobjects.pro +++ b/src/imports/remoteobjects/remoteobjects.pro @@ -1,7 +1,7 @@ CXX_MODULE = qml TARGET = qtremoteobjects TARGETPATH = QtRemoteObjects -IMPORT_VERSION = 5.12 +IMPORT_VERSION = 5.$$QT_MINOR_VERSION QT += qml remoteobjects diff --git a/src/remoteobjects/doc/src/remoteobjects-qml.qdoc b/src/remoteobjects/doc/src/remoteobjects-qml.qdoc index 2d88689..cdd3d5c 100644 --- a/src/remoteobjects/doc/src/remoteobjects-qml.qdoc +++ b/src/remoteobjects/doc/src/remoteobjects-qml.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! -\qmlmodule QtRemoteObjects 5.12 +\qmlmodule QtRemoteObjects 5.\QtMinorVersion \title Qt Remote Objects QML Types \ingroup qmlmodules \brief Provides QML types for remote objects support. @@ -48,9 +48,9 @@ qmlRegisterType<MyTypeReplica>("custom",1,0,"MyTypeReplica") \endcode And then used from QML in conjunction with the base type Node: -\code +\qml \QtMinorVersion import QtQuick 2.0 -import QtRemoteObjects 5.12 +import QtRemoteObjects 5.\1 import custom 1.0 Item { @@ -66,7 +66,7 @@ Item { onClicked: myType.pushMyProp("Updated Text") } } -\endcode +\endqml Note that by default you cannot directly assign to a replica property, but rather use a \c push function. This is due to the potential problems that arise from the mix of declarative programming and asynchronous updates. @@ -78,9 +78,9 @@ console.log(myType.myProp) // logs "Hello World", as the new text has not yet be The QML types in this module can be imported into your application using the following import statement in your .qml file: -\code -import QtRemoteObjects 5.12 -\endcode +\qml \QtMinorVersion +import QtRemoteObjects 5.\1 +\endqml \section1 QML Types */ |