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

Change-Id: I76b32ad6f263b4a45c0f7c9b40a121528dd3bc14

5 files changed, 25 insertions, 19 deletions

diff --git a/src/imports/scxmlstatemachine/plugin.cpp b/src/imports/scxmlstatemachine/plugin.cpp
index 35d5668..69c2992 100644
--- a/src/imports/scxmlstatemachine/plugin.cpp
+++ b/src/imports/scxmlstatemachine/plugin.cpp
@@ -74,6 +74,10 @@ public:
         qmlRegisterType<QScxmlInvokedServices>(uri, major, minor, "InvokedServices");
         qmlRegisterExtendedUncreatableType<QScxmlStateMachine, QScxmlStateMachineExtended>(
                     uri, major, minor, "StateMachine", "Only created through derived types");
+
+        // Auto-increment the import to stay in sync with ALL future QtQuick minor versions
+        qmlRegisterModule(uri, major, QT_VERSION_MINOR);
+
         qmlProtectModule(uri, 1);
     }
 };
diff --git a/src/imports/scxmlstatemachine/plugins.qmltypes b/src/imports/scxmlstatemachine/plugins.qmltypes
index a7a72e7..f0b5a20 100644
--- a/src/imports/scxmlstatemachine/plugins.qmltypes
+++ b/src/imports/scxmlstatemachine/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 QtScxml 5.8'
+// 'qmlplugindump -nonrelocatable QtScxml 5.13'
 
 Module {
-    dependencies: ["QtQuick 2.8"]
+    dependencies: ["QtQuick 2.0"]
     Component {
         name: "QScxmlEventConnection"
         prototype: "QObject"
@@ -32,7 +32,11 @@ Module {
     }
     Component {
         name: "QScxmlStateMachine"
+        defaultProperty: "children"
         prototype: "QObject"
+        exports: ["QtScxml/StateMachine 5.8"]
+        isCreatable: false
+        exportMetaObjectRevisions: [508]
         Property { name: "running"; type: "bool" }
         Property { name: "initialized"; type: "bool"; isReadonly: true }
         Property { name: "dataModel"; type: "QScxmlDataModel"; isPointer: true }
@@ -42,7 +46,8 @@ Module {
         Property { name: "name"; type: "string"; isReadonly: true }
         Property { name: "invoked"; type: "bool"; isReadonly: true }
         Property { name: "parseErrors"; type: "QVector<QScxmlError>"; isReadonly: true }
-        Property { name: "loader"; type: "QScxmlParser::Loader"; isPointer: true }
+        Property { name: "loader"; type: "QScxmlCompiler::Loader"; isPointer: true }
+        Property { name: "tableData"; type: "QScxmlTableData"; isPointer: true }
         Signal {
             name: "runningChanged"
             Parameter { name: "running"; type: "bool" }
@@ -72,7 +77,11 @@ Module {
         }
         Signal {
             name: "loaderChanged"
-            Parameter { name: "loader"; type: "QScxmlParser::Loader"; isPointer: true }
+            Parameter { name: "loader"; type: "QScxmlCompiler::Loader"; isPointer: true }
+        }
+        Signal {
+            name: "tableDataChanged"
+            Parameter { name: "tableData"; type: "QScxmlTableData"; isPointer: true }
         }
         Method { name: "start" }
         Method { name: "stop" }
@@ -116,15 +125,7 @@ Module {
             type: "bool"
             Parameter { name: "target"; type: "string" }
         }
-    }
-    Component {
-        name: "QScxmlStateMachineExtended"
-        defaultProperty: "children"
-        prototype: "QScxmlStateMachine"
-        exports: ["QtScxml/StateMachine 5.8"]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Property { name: "children"; type: "QObject"; isList: true; isReadonly: true }
+        Property { name: "children"; revision: 508; type: "QObject"; isList: true; isReadonly: true }
     }
     Component {
         name: "QScxmlStateMachineLoader"
diff --git a/src/imports/scxmlstatemachine/scxmlstatemachine.pro b/src/imports/scxmlstatemachine/scxmlstatemachine.pro
index a45a5f3..9bc7c72 100644
--- a/src/imports/scxmlstatemachine/scxmlstatemachine.pro
+++ b/src/imports/scxmlstatemachine/scxmlstatemachine.pro
@@ -1,5 +1,6 @@
 TARGET = scxml
 TARGETPATH = QtScxml
+IMPORT_VERSION = 5.$$QT_MINOR_VERSION
 
 QT = scxml qml-private core-private
 
diff --git a/src/scxml/doc/qtscxml-index.qdoc b/src/scxml/doc/qtscxml-index.qdoc
index 7fd77bb..b65a1c2 100644
--- a/src/scxml/doc/qtscxml-index.qdoc
+++ b/src/scxml/doc/qtscxml-index.qdoc
@@ -48,9 +48,9 @@
     To import the QML types into your application, use the following import statement
     in your .qml file:
 
-    \code
-    import QtScxml 5.8
-    \endcode
+    \qml \QtMinorVersion
+    import QtScxml 5.\1
+    \endqml
 
     To link against the module, add this line to your qmake .pro file:
 
diff --git a/src/scxml/doc/qtscxml-module-qml.qdoc b/src/scxml/doc/qtscxml-module-qml.qdoc
index e549f48..5fdae36 100644
--- a/src/scxml/doc/qtscxml-module-qml.qdoc
+++ b/src/scxml/doc/qtscxml-module-qml.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \qmlmodule QtScxml 5.8
+    \qmlmodule QtScxml 5.\QtMinorVersion
     \title Qt SCXML QML Types
     \ingroup qmlmodules
     \brief Enables the use of SCXML state machines with QML.
@@ -34,8 +34,8 @@
     To import the QML types into your application, use the following import statement
     in your .qml file:
 
-    \code
-    import QtScxml 5.8
+    \code \QtMinorVersion
+    import QtScxml 5.\1
     \endcode
 
     For more information, see \l{Instantiating State Machines}.