summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-22 03:03:05 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-22 03:03:05 +0200
commit7e48ed01a3e70fae7dfaf599fd9b4300df537ecd (patch)
tree9c4e5a777dbc8eff930380de812fbe00d445e65b
parent84bb562bfc1168121774d3c4b073e3e05b6efcde (diff)
parent8be5e49379fa8c0f1e1e41ff4bce91e30699b352 (diff)
Merge remote-tracking branch 'origin/5.13' into dev
-rw-r--r--dist/changes-5.13.018
-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
4 files changed, 25 insertions, 10 deletions
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/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>