Hello community, here is the log from the commit of package libqt5-qtscxml for openSUSE:Factory checked in at 2017-10-24 22:22:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtscxml (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtscxml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtscxml" Tue Oct 24 22:22:04 2017 rev:2 rq:533809 version:5.9.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtscxml/libqt5-qtscxml.changes 2017-08-24 18:33:38.343956176 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtscxml.new/libqt5-qtscxml.changes 2017-10-24 22:22:36.226585130 +0200 @@ -1,0 +2,7 @@ +Sun Oct 8 14:08:48 UTC 2017 - [email protected] + +- Update to 5.9.2 + * For more details please see: + https://blog.qt.io/blog/2017/10/06/qt-5-9-2-released/ + +------------------------------------------------------------------- Old: ---- qtscxml-opensource-src-5.9.1.tar.xz New: ---- qtscxml-opensource-src-5.9.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtscxml.spec ++++++ --- /var/tmp/diff_new_pack.JxtrAn/_old 2017-10-24 22:22:36.746560824 +0200 +++ /var/tmp/diff_new_pack.JxtrAn/_new 2017-10-24 22:22:36.750560637 +0200 @@ -21,15 +21,15 @@ %define libname libQt5Scxml5 Name: libqt5-qtscxml -Version: 5.9.1 +Version: 5.9.2 Release: 0 Summary: Qt 5 State Chart XML Library License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Group: System/Libraries Url: http://qt.io %define base_name libqt5 -%define real_version 5.9.1 -%define so_version 5.9.1 +%define real_version 5.9.2 +%define so_version 5.9.2 %define tar_version qtscxml-opensource-src-%{real_version} Source: https://download.qt.io/official_releases/qt/5.9/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf @@ -94,8 +94,8 @@ %package devel Summary: Development files for Qt5's State Chart XML library Group: Development/Libraries/C and C++ -Requires: %{name}-tools = %{version} Requires: %libname = %{version} +Requires: %{name}-tools = %{version} %description devel You need this package if you want to compile programs with QtScxml. @@ -185,3 +185,5 @@ %defattr(-,root,root,755) %doc LICENSE.* %{_libqt5_examplesdir}/ + +%changelog ++++++ qtscxml-opensource-src-5.9.1.tar.xz -> qtscxml-opensource-src-5.9.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/.qmake.conf new/qtscxml-opensource-src-5.9.2/.qmake.conf --- old/qtscxml-opensource-src-5.9.1/.qmake.conf 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/.qmake.conf 2017-09-28 10:54:53.000000000 +0200 @@ -2,4 +2,4 @@ CONFIG += qt_example_installs CONFIG += warning_clean -MODULE_VERSION = 5.9.1 +MODULE_VERSION = 5.9.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/.tag new/qtscxml-opensource-src-5.9.2/.tag --- old/qtscxml-opensource-src-5.9.1/.tag 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/.tag 2017-09-28 10:54:53.000000000 +0200 @@ -1 +1 @@ -fd324b6385842b15f7dda4116b19adbaec3195b7 +3caae998c8c1770cd96cadba24d89a60005c5fe7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/dist/changes-5.9.2 new/qtscxml-opensource-src-5.9.2/dist/changes-5.9.2 --- old/qtscxml-opensource-src-5.9.1/dist/changes-5.9.2 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-opensource-src-5.9.2/dist/changes-5.9.2 2017-09-28 10:54:53.000000000 +0200 @@ -0,0 +1,22 @@ +Qt 5.9.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +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. + +**************************************************************************** +* Qt 5.9.2 Changes * +**************************************************************************** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/examples/scxml/calculator-qml/calculator-qml.qml new/qtscxml-opensource-src-5.9.2/examples/scxml/calculator-qml/calculator-qml.qml --- old/qtscxml-opensource-src-5.9.1/examples/scxml/calculator-qml/calculator-qml.qml 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/examples/scxml/calculator-qml/calculator-qml.qml 2017-09-28 10:54:53.000000000 +0200 @@ -79,8 +79,8 @@ color: "#46a2da" Text { id: resultText - anchors.leftMargin: operations.implicitMargin - anchors.rightMargin: operations.implicitMargin + anchors.leftMargin: buttons.implicitMargin + anchors.rightMargin: buttons.implicitMargin anchors.fill: parent horizontalAlignment: Text.AlignRight verticalAlignment: Text.AlignVCenter @@ -93,7 +93,7 @@ } Item { - id: operations + id: buttons anchors.top: resultArea.bottom anchors.left: parent.left anchors.right: parent.right @@ -102,12 +102,13 @@ var ret = 0; for (var i = 0; i < visibleChildren.length; ++i) { var child = visibleChildren[i]; - ret += (child.implicitMargin || 0) / visibleChildren.length; + ret += (child.implicitMargin || 0); } - return ret; + return ret / visibleChildren.length; } Repeater { + id: operations model: ["÷", "×", "+", "-"] Button { y: 0 @@ -130,6 +131,7 @@ } Repeater { + id: digits model: ["7", "8", "9", "4", "5", "6", "1", "2", "3", "0", ".", "C"] Button { x: (index % 3) * width @@ -150,6 +152,7 @@ } Button { + id: resultButton x: 3 * width y: parent.height / 5 textHeight: y - 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/examples/scxml/calculator-widgets/mainwindow.h new/qtscxml-opensource-src-5.9.2/examples/scxml/calculator-widgets/mainwindow.h --- old/qtscxml-opensource-src-5.9.1/examples/scxml/calculator-widgets/mainwindow.h 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/examples/scxml/calculator-widgets/mainwindow.h 2017-09-28 10:54:53.000000000 +0200 @@ -66,7 +66,7 @@ Q_OBJECT public: - explicit MainWindow(QScxmlStateMachine *machine, QWidget *parent = 0); + explicit MainWindow(QScxmlStateMachine *machine, QWidget *parent = nullptr); ~MainWindow(); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/examples/scxml/ftpclient/ftpcontrolchannel.h new/qtscxml-opensource-src-5.9.2/examples/scxml/ftpclient/ftpcontrolchannel.h --- old/qtscxml-opensource-src-5.9.1/examples/scxml/ftpclient/ftpcontrolchannel.h 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/examples/scxml/ftpclient/ftpcontrolchannel.h 2017-09-28 10:54:53.000000000 +0200 @@ -59,7 +59,7 @@ { Q_OBJECT public: - explicit FtpControlChannel(QObject *parent = 0); + explicit FtpControlChannel(QObject *parent = nullptr); // Connect to an FTP server void connectToServer(const QString &server); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/examples/scxml/ftpclient/ftpdatachannel.h new/qtscxml-opensource-src-5.9.2/examples/scxml/ftpclient/ftpdatachannel.h --- old/qtscxml-opensource-src-5.9.1/examples/scxml/ftpclient/ftpdatachannel.h 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/examples/scxml/ftpclient/ftpdatachannel.h 2017-09-28 10:54:53.000000000 +0200 @@ -60,7 +60,7 @@ { Q_OBJECT public: - explicit FtpDataChannel(QObject *parent = 0); + explicit FtpDataChannel(QObject *parent = nullptr); // Listen on a local address. void listen(const QHostAddress &address = QHostAddress::Any); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/examples/scxml/mediaplayer-common/Mediaplayer.qml new/qtscxml-opensource-src-5.9.2/examples/scxml/mediaplayer-common/Mediaplayer.qml --- old/qtscxml-opensource-src-5.9.1/examples/scxml/mediaplayer-common/Mediaplayer.qml 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/examples/scxml/mediaplayer-common/Mediaplayer.qml 2017-09-28 10:54:53.000000000 +0200 @@ -119,22 +119,24 @@ stateMachine: root.stateMachine events: ["playbackStarted", "playbackStopped"] onOccurred: { - var media = event.data.media + var media = event.data.media; if (event.name === "playbackStarted") { - theText.text = "Playing '" + media + "'" + theText.text = "Playing '" + media + "'"; theLog.text = theLog.text + "\nplaybackStarted with data: " - + JSON.stringify(event.data) + + JSON.stringify(event.data); } else if (event.name === "playbackStopped") { - theText.text = "Stopped '" + media + "'" + theText.text = "Stopped '" + media + "'"; theLog.text = theLog.text + "\nplaybackStopped with data: " - + JSON.stringify(event.data) + + JSON.stringify(event.data); } } } + // Submit tap event to state machine. + // "tap" toggles playing state of the current media. function tap(idx) { - var media = theModel.get(idx).media - var data = { "media": media } - stateMachine.submitEvent("tap", data) + var media = theModel.get(idx).media; + var data = { "media": media }; + stateMachine.submitEvent("tap", data); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/examples/scxml/mediaplayer-common/mainwindow.h new/qtscxml-opensource-src-5.9.2/examples/scxml/mediaplayer-common/mainwindow.h --- old/qtscxml-opensource-src-5.9.1/examples/scxml/mediaplayer-common/mainwindow.h 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/examples/scxml/mediaplayer-common/mainwindow.h 2017-09-28 10:54:53.000000000 +0200 @@ -68,7 +68,7 @@ Q_OBJECT public: - explicit MainWindow(QScxmlStateMachine *stateMachine, QWidget *parent = 0); + explicit MainWindow(QScxmlStateMachine *stateMachine, QWidget *parent = nullptr); ~MainWindow(); private slots: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/examples/scxml/pinball/mainwindow.h new/qtscxml-opensource-src-5.9.2/examples/scxml/pinball/mainwindow.h --- old/qtscxml-opensource-src-5.9.1/examples/scxml/pinball/mainwindow.h 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/examples/scxml/pinball/mainwindow.h 2017-09-28 10:54:53.000000000 +0200 @@ -66,7 +66,7 @@ Q_OBJECT public: - explicit MainWindow(QScxmlStateMachine *machine, QWidget *parent = 0); + explicit MainWindow(QScxmlStateMachine *machine, QWidget *parent = nullptr); ~MainWindow(); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/examples/scxml/sudoku/mainwindow.cpp new/qtscxml-opensource-src-5.9.2/examples/scxml/sudoku/mainwindow.cpp --- old/qtscxml-opensource-src-5.9.1/examples/scxml/sudoku/mainwindow.cpp 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/examples/scxml/sudoku/mainwindow.cpp 2017-09-28 10:54:53.000000000 +0200 @@ -174,7 +174,7 @@ foreach (const QFileInfo &sudokuFile, sudokuFiles) m_chooser->addItem(sudokuFile.completeBaseName(), sudokuFile.absoluteFilePath()); - connect(m_chooser, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), + connect(m_chooser, QOverload<int>::of(&QComboBox::currentIndexChanged), [this] (int index) { const QString sudokuFile = m_chooser->itemData(index).toString(); const QVariantMap initValues = readSudoku(sudokuFile); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/examples/scxml/sudoku/mainwindow.h new/qtscxml-opensource-src-5.9.2/examples/scxml/sudoku/mainwindow.h --- old/qtscxml-opensource-src-5.9.1/examples/scxml/sudoku/mainwindow.h 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/examples/scxml/sudoku/mainwindow.h 2017-09-28 10:54:53.000000000 +0200 @@ -66,7 +66,7 @@ Q_OBJECT public: - explicit MainWindow(QScxmlStateMachine *machine, QWidget *parent = 0); + explicit MainWindow(QScxmlStateMachine *machine, QWidget *parent = nullptr); ~MainWindow(); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/examples/scxml/trafficlight-common/trafficlight.cpp new/qtscxml-opensource-src-5.9.2/examples/scxml/trafficlight-common/trafficlight.cpp --- old/qtscxml-opensource-src-5.9.1/examples/scxml/trafficlight-common/trafficlight.cpp 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/examples/scxml/trafficlight-common/trafficlight.cpp 2017-09-28 10:54:53.000000000 +0200 @@ -55,7 +55,7 @@ class TrafficLightWidget : public QWidget { public: - TrafficLightWidget(QWidget *parent = 0) + TrafficLightWidget(QWidget *parent = nullptr) : QWidget(parent), m_background(QLatin1String(":/background.png")) { QVBoxLayout *vbox = new QVBoxLayout(this); @@ -76,14 +76,14 @@ LightWidget *greenLight() const { return m_green; } - virtual void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE + virtual void paintEvent(QPaintEvent *) override { QPainter painter(this); painter.setRenderHint(QPainter::Antialiasing); painter.drawImage(0, 0, m_background); } - virtual QSize sizeHint() const Q_DECL_OVERRIDE + virtual QSize sizeHint() const override { return m_background.size(); } @@ -133,7 +133,6 @@ LightWidget::LightWidget(const QString &image, QWidget *parent) : QWidget(parent) , m_image(image) - , m_on(false) {} bool LightWidget::isOn() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/examples/scxml/trafficlight-common/trafficlight.h new/qtscxml-opensource-src-5.9.2/examples/scxml/trafficlight-common/trafficlight.h --- old/qtscxml-opensource-src-5.9.1/examples/scxml/trafficlight-common/trafficlight.h 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/examples/scxml/trafficlight-common/trafficlight.h 2017-09-28 10:54:53.000000000 +0200 @@ -61,7 +61,7 @@ Q_OBJECT public: - TrafficLight(QScxmlStateMachine *machine, QWidget *parent = 0); + TrafficLight(QScxmlStateMachine *machine, QWidget *parent = nullptr); private slots: void toggleWorking(bool pause); @@ -76,7 +76,7 @@ Q_PROPERTY(bool on READ isOn WRITE setOn) public: - LightWidget(const QString &image, QWidget *parent = 0); + LightWidget(const QString &image, QWidget *parent = nullptr); bool isOn() const; void setOn(bool on); @@ -85,23 +85,23 @@ void switchLight(bool onoff); protected: - virtual void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - virtual QSize sizeHint() const Q_DECL_OVERRIDE; + virtual void paintEvent(QPaintEvent *) override; + virtual QSize sizeHint() const override; private: QImage m_image; - bool m_on; + bool m_on = false; }; class ButtonWidget : public QAbstractButton { Q_OBJECT public: - ButtonWidget(QWidget *parent = 0); + ButtonWidget(QWidget *parent = nullptr); protected: - virtual void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - virtual QSize sizeHint() const Q_DECL_OVERRIDE; + virtual void paintEvent(QPaintEvent *) override; + virtual QSize sizeHint() const override; private: QImage m_playIcon; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/examples/scxml/trafficlight-qml-simple/TrafficLight.qml new/qtscxml-opensource-src-5.9.2/examples/scxml/trafficlight-qml-simple/TrafficLight.qml --- old/qtscxml-opensource-src-5.9.1/examples/scxml/trafficlight-qml-simple/TrafficLight.qml 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/examples/scxml/trafficlight-qml-simple/TrafficLight.qml 2017-09-28 10:54:53.000000000 +0200 @@ -70,6 +70,7 @@ Light { anchors.top: parent.top + anchors.horizontalCenter: parent.horizontalCenter color: "red" visible: stateMachine.red || stateMachine.redGoingGreen } @@ -82,6 +83,7 @@ Light { anchors.bottom: parent.bottom + anchors.horizontalCenter: parent.horizontalCenter color: "green" visible: stateMachine.green } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.1/QtScxml/private/qscxmlcompiler_p.h new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.1/QtScxml/private/qscxmlcompiler_p.h --- old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.1/QtScxml/private/qscxmlcompiler_p.h 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.1/QtScxml/private/qscxmlcompiler_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/scxml/qscxmlcompiler_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.1/QtScxml/private/qscxmlcppdatamodel_p.h new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.1/QtScxml/private/qscxmlcppdatamodel_p.h --- old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.1/QtScxml/private/qscxmlcppdatamodel_p.h 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.1/QtScxml/private/qscxmlcppdatamodel_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/scxml/qscxmlcppdatamodel_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.1/QtScxml/private/qscxmldatamodel_p.h new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.1/QtScxml/private/qscxmldatamodel_p.h --- old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.1/QtScxml/private/qscxmldatamodel_p.h 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.1/QtScxml/private/qscxmldatamodel_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/scxml/qscxmldatamodel_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.1/QtScxml/private/qscxmlecmascriptplatformproperties_p.h new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.1/QtScxml/private/qscxmlecmascriptplatformproperties_p.h --- old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.1/QtScxml/private/qscxmlecmascriptplatformproperties_p.h 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.1/QtScxml/private/qscxmlecmascriptplatformproperties_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/scxml/qscxmlecmascriptplatformproperties_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.1/QtScxml/private/qscxmlevent_p.h new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.1/QtScxml/private/qscxmlevent_p.h --- old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.1/QtScxml/private/qscxmlevent_p.h 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.1/QtScxml/private/qscxmlevent_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/scxml/qscxmlevent_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.1/QtScxml/private/qscxmlexecutablecontent_p.h new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.1/QtScxml/private/qscxmlexecutablecontent_p.h --- old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.1/QtScxml/private/qscxmlexecutablecontent_p.h 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.1/QtScxml/private/qscxmlexecutablecontent_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/scxml/qscxmlexecutablecontent_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.1/QtScxml/private/qscxmlglobals_p.h new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.1/QtScxml/private/qscxmlglobals_p.h --- old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.1/QtScxml/private/qscxmlglobals_p.h 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.1/QtScxml/private/qscxmlglobals_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/scxml/qscxmlglobals_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.1/QtScxml/private/qscxmlinvokableservice_p.h new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.1/QtScxml/private/qscxmlinvokableservice_p.h --- old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.1/QtScxml/private/qscxmlinvokableservice_p.h 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.1/QtScxml/private/qscxmlinvokableservice_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/scxml/qscxmlinvokableservice_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.1/QtScxml/private/qscxmlstatemachine_p.h new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.1/QtScxml/private/qscxmlstatemachine_p.h --- old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.1/QtScxml/private/qscxmlstatemachine_p.h 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.1/QtScxml/private/qscxmlstatemachine_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/scxml/qscxmlstatemachine_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.1/QtScxml/private/qscxmlstatemachineinfo_p.h new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.1/QtScxml/private/qscxmlstatemachineinfo_p.h --- old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.1/QtScxml/private/qscxmlstatemachineinfo_p.h 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.1/QtScxml/private/qscxmlstatemachineinfo_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/scxml/qscxmlstatemachineinfo_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.1/QtScxml/private/qscxmltabledata_p.h new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.1/QtScxml/private/qscxmltabledata_p.h --- old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.1/QtScxml/private/qscxmltabledata_p.h 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.1/QtScxml/private/qscxmltabledata_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/scxml/qscxmltabledata_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.2/QtScxml/private/qscxmlcompiler_p.h new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.2/QtScxml/private/qscxmlcompiler_p.h --- old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.2/QtScxml/private/qscxmlcompiler_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.2/QtScxml/private/qscxmlcompiler_p.h 2017-09-28 10:54:53.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/scxml/qscxmlcompiler_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.2/QtScxml/private/qscxmlcppdatamodel_p.h new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.2/QtScxml/private/qscxmlcppdatamodel_p.h --- old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.2/QtScxml/private/qscxmlcppdatamodel_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.2/QtScxml/private/qscxmlcppdatamodel_p.h 2017-09-28 10:54:53.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/scxml/qscxmlcppdatamodel_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.2/QtScxml/private/qscxmldatamodel_p.h new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.2/QtScxml/private/qscxmldatamodel_p.h --- old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.2/QtScxml/private/qscxmldatamodel_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.2/QtScxml/private/qscxmldatamodel_p.h 2017-09-28 10:54:53.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/scxml/qscxmldatamodel_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.2/QtScxml/private/qscxmlecmascriptplatformproperties_p.h new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.2/QtScxml/private/qscxmlecmascriptplatformproperties_p.h --- old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.2/QtScxml/private/qscxmlecmascriptplatformproperties_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.2/QtScxml/private/qscxmlecmascriptplatformproperties_p.h 2017-09-28 10:54:53.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/scxml/qscxmlecmascriptplatformproperties_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.2/QtScxml/private/qscxmlevent_p.h new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.2/QtScxml/private/qscxmlevent_p.h --- old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.2/QtScxml/private/qscxmlevent_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.2/QtScxml/private/qscxmlevent_p.h 2017-09-28 10:54:53.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/scxml/qscxmlevent_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.2/QtScxml/private/qscxmlexecutablecontent_p.h new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.2/QtScxml/private/qscxmlexecutablecontent_p.h --- old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.2/QtScxml/private/qscxmlexecutablecontent_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.2/QtScxml/private/qscxmlexecutablecontent_p.h 2017-09-28 10:54:53.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/scxml/qscxmlexecutablecontent_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.2/QtScxml/private/qscxmlglobals_p.h new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.2/QtScxml/private/qscxmlglobals_p.h --- old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.2/QtScxml/private/qscxmlglobals_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.2/QtScxml/private/qscxmlglobals_p.h 2017-09-28 10:54:53.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/scxml/qscxmlglobals_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.2/QtScxml/private/qscxmlinvokableservice_p.h new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.2/QtScxml/private/qscxmlinvokableservice_p.h --- old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.2/QtScxml/private/qscxmlinvokableservice_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.2/QtScxml/private/qscxmlinvokableservice_p.h 2017-09-28 10:54:53.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/scxml/qscxmlinvokableservice_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.2/QtScxml/private/qscxmlstatemachine_p.h new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.2/QtScxml/private/qscxmlstatemachine_p.h --- old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.2/QtScxml/private/qscxmlstatemachine_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.2/QtScxml/private/qscxmlstatemachine_p.h 2017-09-28 10:54:53.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/scxml/qscxmlstatemachine_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.2/QtScxml/private/qscxmlstatemachineinfo_p.h new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.2/QtScxml/private/qscxmlstatemachineinfo_p.h --- old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.2/QtScxml/private/qscxmlstatemachineinfo_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.2/QtScxml/private/qscxmlstatemachineinfo_p.h 2017-09-28 10:54:53.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/scxml/qscxmlstatemachineinfo_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.2/QtScxml/private/qscxmltabledata_p.h new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.2/QtScxml/private/qscxmltabledata_p.h --- old/qtscxml-opensource-src-5.9.1/include/QtScxml/5.9.2/QtScxml/private/qscxmltabledata_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-opensource-src-5.9.2/include/QtScxml/5.9.2/QtScxml/private/qscxmltabledata_p.h 2017-09-28 10:54:53.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/scxml/qscxmltabledata_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/include/QtScxml/qtscxmlversion.h new/qtscxml-opensource-src-5.9.2/include/QtScxml/qtscxmlversion.h --- old/qtscxml-opensource-src-5.9.1/include/QtScxml/qtscxmlversion.h 2017-06-29 01:59:46.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/include/QtScxml/qtscxmlversion.h 2017-10-04 09:26:39.000000000 +0200 @@ -2,8 +2,8 @@ #ifndef QT_QTSCXML_VERSION_H #define QT_QTSCXML_VERSION_H -#define QTSCXML_VERSION_STR "5.9.1" +#define QTSCXML_VERSION_STR "5.9.2" -#define QTSCXML_VERSION 0x050901 +#define QTSCXML_VERSION 0x050902 #endif // QT_QTSCXML_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/src/imports/scxmlstatemachine/statemachineloader.cpp new/qtscxml-opensource-src-5.9.2/src/imports/scxmlstatemachine/statemachineloader.cpp --- old/qtscxml-opensource-src-5.9.1/src/imports/scxmlstatemachine/statemachineloader.cpp 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/src/imports/scxmlstatemachine/statemachineloader.cpp 2017-09-28 10:54:53.000000000 +0200 @@ -163,7 +163,18 @@ return false; } - m_stateMachine = QScxmlStateMachine::fromData(&buf, source.toString()); + QString fileName; + if (source.isLocalFile()) { + fileName = source.toLocalFile(); + } else if (source.scheme() == QStringLiteral("qrc")) { + fileName = ":" + source.path(); + } else { + qmlWarning(this) << QStringLiteral("%1 is neither a local nor a resource URL.") + .arg(source.url()) + << QStringLiteral("Invoking services by relative path will not work."); + } + + m_stateMachine = QScxmlStateMachine::fromData(&buf, fileName); m_stateMachine->setParent(this); m_implicitDataModel = m_stateMachine->dataModel(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/src/scxml/doc/qtscxml-instantiating-state-machines.qdoc new/qtscxml-opensource-src-5.9.2/src/scxml/doc/qtscxml-instantiating-state-machines.qdoc --- old/qtscxml-opensource-src-5.9.1/src/scxml/doc/qtscxml-instantiating-state-machines.qdoc 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/src/scxml/doc/qtscxml-instantiating-state-machines.qdoc 2017-09-28 10:54:53.000000000 +0200 @@ -146,8 +146,8 @@ \code stateMachine->submitEvent("tap", QVariantMap({ - std::make_pair("artist", "Fatboy Slim"), - std::make_pair("title", "The Rockafeller Skank") + { "artist", "Fatboy Slim" }, + { "title", "The Rockafeller Skank" } }); \endcode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/src/scxml/qscxmlstatemachine.cpp new/qtscxml-opensource-src-5.9.2/src/scxml/qscxmlstatemachine.cpp --- old/qtscxml-opensource-src-5.9.1/src/scxml/qscxmlstatemachine.cpp 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/src/scxml/qscxmlstatemachine.cpp 2017-09-28 10:54:53.000000000 +0200 @@ -731,7 +731,9 @@ { Q_Q(QScxmlStateMachine); void *args[] = { Q_NULLPTR, const_cast<void*>(reinterpret_cast<const void*>(&active)) }; - QMetaObject::activate(q, m_metaObject, stateIndex, args); + const int signalIndex = m_stateIndexToSignalIndex.value(stateIndex, -1); + if (signalIndex >= 0) + QMetaObject::activate(q, m_metaObject, signalIndex, args); } void QScxmlStateMachinePrivate::emitInvokedServicesChanged() @@ -755,6 +757,26 @@ info, &QScxmlStateMachineInfo::transitionsTriggered); } +void QScxmlStateMachinePrivate::updateMetaCache() +{ + m_stateIndexToSignalIndex.clear(); + + if (!m_tableData) + return; + + if (!m_stateTable) + return; + + int signalIndex = 0; + for (int i = 0; i < m_stateTable->stateCount; ++i) { + const auto &s = m_stateTable->state(i); + if (!s.isHistoryState() && s.type != StateTable::State::Invalid) { + m_stateIndexToSignalIndex.insert(i, signalIndex); + ++signalIndex; + } + } +} + QStringList QScxmlStateMachinePrivate::stateNames(const std::vector<int> &stateIndexes) const { QStringList names; @@ -1767,6 +1789,8 @@ == QScxmlExecutableContent::StateTable::terminator); } + d->updateMetaCache(); + emit tableDataChanged(tableData); } @@ -2174,7 +2198,7 @@ if (target.startsWith(QStringLiteral("#_"))) { QStringRef targetId = target.midRef(2); for (auto invokedService : d->m_invokedServices) { - if (invokedService.service->id() == targetId) + if (invokedService.service && invokedService.service->id() == targetId) return true; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/src/scxml/qscxmlstatemachine_p.h new/qtscxml-opensource-src-5.9.2/src/scxml/qscxmlstatemachine_p.h --- old/qtscxml-opensource-src-5.9.1/src/scxml/qscxmlstatemachine_p.h 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/src/scxml/qscxmlstatemachine_p.h 2017-09-28 10:54:53.000000000 +0200 @@ -283,6 +283,8 @@ void attach(QScxmlStateMachineInfo *info); const OrderedSet &configuration() const { return m_configuration; } + void updateMetaCache(); + private: QStringList stateNames(const std::vector<int> &stateIndexes) const; std::vector<int> historyStates(int stateIdx) const; @@ -379,6 +381,8 @@ bool isPaused() const { return m_runningState == Paused; } QScxmlInternal::StateMachineInfoProxy *m_infoSignalProxy; + + QHash<int, int> m_stateIndexToSignalIndex; }; QT_END_NAMESPACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/tests/auto/statemachine/historystate.scxml new/qtscxml-opensource-src-5.9.2/tests/auto/statemachine/historystate.scxml --- old/qtscxml-opensource-src-5.9.1/tests/auto/statemachine/historystate.scxml 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-opensource-src-5.9.2/tests/auto/statemachine/historystate.scxml 2017-09-28 10:54:53.000000000 +0200 @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<scxml xmlns="http://www.w3.org/2005/07/scxml"; version="1.0" binding="early" name="HistoryState"> + <state id="Working"> + <state id="State1"> + <onentry> + <send event="timeout" delay="1s"/> + </onentry> + </state> + <history type="shallow" id="HistoryState"/> + <transition type="external" event="timeout" target="State2"/> + </state> + <state id="State2"/> +</scxml> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/tests/auto/statemachine/multipleinvokableservices.scxml new/qtscxml-opensource-src-5.9.2/tests/auto/statemachine/multipleinvokableservices.scxml --- old/qtscxml-opensource-src-5.9.1/tests/auto/statemachine/multipleinvokableservices.scxml 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-opensource-src-5.9.2/tests/auto/statemachine/multipleinvokableservices.scxml 2017-09-28 10:54:53.000000000 +0200 @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<scxml xmlns="http://www.w3.org/2005/07/scxml"; version="1.0" binding="early" name="MultipleInvokableServices.scxml" datamodel="ecmascript" initial="TopState"> + <datamodel> + <data id="Var"/> + </datamodel> + <state id="TopState"> + <state id="State1"> + <invoke id="invoke1"> + <content> + <scxml xmlns="http://www.w3.org/2005/07/scxml"; version="1.0" binding="early" name="anywhere"> + <state id="foo"> + <onentry> + <send target="#_parent" event="running1"/> + </onentry> + <transition event="toChild"> + <send target="#_parent" event="received1"/> + </transition> + </state> + </scxml> + </content> + </invoke> + </state> + <state id="State2"> + <invoke id="invoke2"> + <content> + <scxml xmlns="http://www.w3.org/2005/07/scxml"; version="1.0" binding="early" name="anywhere"> + <state id="foo"> + <onentry> + <send target="#_parent" event="running2"/> + </onentry> + </state> + </scxml> + </content> + </invoke> + </state> + <transition event="running1"> + <send event="toChild" target="#_invoke1"/> + </transition> + <transition event="received1"> + <assign location="Var" expr="1"/> + <send event="toChild" target="#_invoke2"/> + </transition> + <transition event="error.communication" cond="Var == 1" target="success"/> + <transition event="*" target="failure"/> + </state> + <final id="success"/> + <final id="failure"/> +</scxml> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/tests/auto/statemachine/tst_statemachine.cpp new/qtscxml-opensource-src-5.9.2/tests/auto/statemachine/tst_statemachine.cpp --- old/qtscxml-opensource-src-5.9.1/tests/auto/statemachine/tst_statemachine.cpp 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/tests/auto/statemachine/tst_statemachine.cpp 2017-09-28 10:54:53.000000000 +0200 @@ -48,6 +48,7 @@ void activeStateNames_data(); void activeStateNames(); void connections(); + void historyState(); void onExit(); void eventOccurred(); @@ -55,6 +56,8 @@ void running(); void invokeStateMachine(); + + void multipleInvokableServices(); // QTBUG-61484 }; void tst_StateMachine::stateNames_data() @@ -251,6 +254,24 @@ #endif } +void tst_StateMachine::historyState() +{ + QScopedPointer<QScxmlStateMachine> stateMachine( + QScxmlStateMachine::fromFile(QString(":/tst_statemachine/historystate.scxml"))); + QVERIFY(!stateMachine.isNull()); + + bool state2Reached = false; + QMetaObject::Connection state2Connection = stateMachine->connectToState("State2", + [&state2Reached](bool enabled) { + state2Reached = state2Reached || enabled; + }); + QVERIFY(state2Connection); + + stateMachine->start(); + + QTRY_VERIFY(state2Reached); +} + void tst_StateMachine::onExit() { #if defined(__cpp_return_type_deduction) && __cpp_return_type_deduction == 201304 @@ -365,7 +386,6 @@ finishedSpy.wait(5000); QCOMPARE(finishedSpy.count(), 1); QCOMPARE(stateMachine->activeStateNames(true).size(), 1); - qDebug() << stateMachine->activeStateNames(true); QVERIFY(stateMachine->activeStateNames(true).contains(QLatin1String("success"))); } @@ -409,6 +429,22 @@ QTRY_VERIFY(subMachine->activeStateNames().contains("here")); } +void tst_StateMachine::multipleInvokableServices() +{ + QScopedPointer<QScxmlStateMachine> stateMachine( + QScxmlStateMachine::fromFile(QString(":/tst_statemachine/multipleinvokableservices.scxml"))); + QVERIFY(!stateMachine.isNull()); + + QSignalSpy finishedSpy(stateMachine.data(), SIGNAL(finished())); + stateMachine->start(); + QCOMPARE(stateMachine->isRunning(), true); + + finishedSpy.wait(5000); + QCOMPARE(finishedSpy.count(), 1); + QCOMPARE(stateMachine->activeStateNames(true).size(), 1); + QVERIFY(stateMachine->activeStateNames(true).contains(QLatin1String("success"))); +} + QTEST_MAIN(tst_StateMachine) #include "tst_statemachine.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-opensource-src-5.9.1/tests/auto/statemachine/tst_statemachine.qrc new/qtscxml-opensource-src-5.9.2/tests/auto/statemachine/tst_statemachine.qrc --- old/qtscxml-opensource-src-5.9.1/tests/auto/statemachine/tst_statemachine.qrc 2017-06-23 08:32:08.000000000 +0200 +++ new/qtscxml-opensource-src-5.9.2/tests/auto/statemachine/tst_statemachine.qrc 2017-09-28 10:54:53.000000000 +0200 @@ -6,5 +6,7 @@ <file>ids1.scxml</file> <file>stateDotDoneEvent.scxml</file> <file>invoke.scxml</file> + <file>historystate.scxml</file> + <file>multipleinvokableservices.scxml</file> </qresource> </RCC>
