summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.qmake.conf2
-rw-r--r--dist/changes-5.13.018
-rw-r--r--src/imports/scxmlstatemachine/plugin.cpp4
-rw-r--r--src/imports/scxmlstatemachine/plugins.qmltypes27
-rw-r--r--src/imports/scxmlstatemachine/scxmlstatemachine.pro1
-rw-r--r--src/scxml/doc/qtscxml-index.qdoc6
-rw-r--r--src/scxml/doc/qtscxml-module-qml.qdoc6
-rw-r--r--src/scxml/doc/qtscxml.qdocconf1
-rw-r--r--tests/3rdparty/scion-tests/scxml-test-framework/test/send-data/send1.json2
-rw-r--r--tools/qscxmlc/scxmlcppdumper.cpp9
-rw-r--r--tools/qscxmlc/templates.qrc6
11 files changed, 52 insertions, 30 deletions
diff --git a/.qmake.conf b/.qmake.conf
index f8878d1..230f0b6 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -2,4 +2,4 @@ load(qt_build_config)
CONFIG += qt_example_installs
CONFIG += warning_clean
-MODULE_VERSION = 5.12.5
+MODULE_VERSION = 5.13.1
diff --git a/dist/changes-5.13.0 b/dist/changes-5.13.0
new file mode 100644
index 0000000..ebb4be1
--- /dev/null
+++ b/dist/changes-5.13.0
@@ -0,0 +1,18 @@
+Qt 5.13 introduces many new features and improvements as well as bugfixes
+over the 5.12.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.13 series is binary compatible with the 5.12.x series.
+Applications compiled for 5.12 will continue to run with 5.13.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.
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}.
diff --git a/src/scxml/doc/qtscxml.qdocconf b/src/scxml/doc/qtscxml.qdocconf
index 4902ae4..6d90bd1 100644
--- a/src/scxml/doc/qtscxml.qdocconf
+++ b/src/scxml/doc/qtscxml.qdocconf
@@ -1,4 +1,5 @@
include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtscxml.qdocconf)
project = QtScxml
description = Qt Scxml Reference Documentation
diff --git a/tests/3rdparty/scion-tests/scxml-test-framework/test/send-data/send1.json b/tests/3rdparty/scion-tests/scxml-test-framework/test/send-data/send1.json
index f21ee8b..84e5c1f 100644
--- a/tests/3rdparty/scion-tests/scxml-test-framework/test/send-data/send1.json
+++ b/tests/3rdparty/scion-tests/scxml-test-framework/test/send-data/send1.json
@@ -6,7 +6,7 @@
"nextConfiguration" : ["b"]
},
{
- "after" : 100,
+ "after" : 300,
"event" : { "name" : "t2" },
"nextConfiguration" : ["e"]
}
diff --git a/tools/qscxmlc/scxmlcppdumper.cpp b/tools/qscxmlc/scxmlcppdumper.cpp
index 40ae1dd..89a403b 100644
--- a/tools/qscxmlc/scxmlcppdumper.cpp
+++ b/tools/qscxmlc/scxmlcppdumper.cpp
@@ -108,13 +108,10 @@ static void genTemplate(QTextStream &out, const QString &filename, const Replace
if (!file.isValid()) {
qFatal("Unable to open template '%s'", qPrintable(filename));
}
+ Q_ASSERT(file.compressionAlgorithm() == QResource::NoCompression);
QByteArray data;
- if (file.isCompressed() && file.size()) {
- data = qUncompress(file.data(), int(file.size()));
- } else {
- data = QByteArray::fromRawData(reinterpret_cast<const char *>(file.data()),
- int(file.size()));
- }
+ data = QByteArray::fromRawData(reinterpret_cast<const char *>(file.data()),
+ int(file.size()));
const QString t = QString::fromLatin1(data);
data.clear();
diff --git a/tools/qscxmlc/templates.qrc b/tools/qscxmlc/templates.qrc
index 6f2ccf6..a00f24e 100644
--- a/tools/qscxmlc/templates.qrc
+++ b/tools/qscxmlc/templates.qrc
@@ -1,7 +1,7 @@
<RCC>
<qresource prefix="/">
- <file>data.t</file>
- <file>decl.t</file>
- <file>cppdatamodel.t</file>
+ <file compression-algorithm="none">data.t</file>
+ <file compression-algorithm="none">decl.t</file>
+ <file compression-algorithm="none">cppdatamodel.t</file>
</qresource>
</RCC>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 08:54:30 +0000