Hello community, here is the log from the commit of package libqt5-qtscxml for openSUSE:Factory checked in at 2019-03-22 15:06:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtscxml (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtscxml.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtscxml" Fri Mar 22 15:06:04 2019 rev:9 rq:685641 version:5.12.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtscxml/libqt5-qtscxml.changes 2018-12-20 12:54:12.330707998 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qtscxml.new.25356/libqt5-qtscxml.changes 2019-03-22 15:06:58.389514992 +0100 @@ -1,0 +2,16 @@ +Thu Mar 14 08:51:44 UTC 2019 - [email protected] + +- Update to 5.12.2: + * New bugfix release + * For more details please see: + * http://code.qt.io/cgit/qt/qtscxml.git/plain/dist/changes-5.12.2/?h=5.12.2 + +------------------------------------------------------------------- +Fri Feb 1 08:40:13 UTC 2019 - [email protected] + +- Update to 5.12.1: + * New bugfix release + * For more details please see: + * http://code.qt.io/cgit/qt/qtscxml.git/plain/dist/changes-5.12.1/?h=v5.12.1 + +------------------------------------------------------------------- Old: ---- qtscxml-everywhere-src-5.12.0.tar.xz New: ---- qtscxml-everywhere-src-5.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtscxml.spec ++++++ --- /var/tmp/diff_new_pack.uodMip/_old 2019-03-22 15:06:59.365514148 +0100 +++ /var/tmp/diff_new_pack.uodMip/_new 2019-03-22 15:06:59.365514148 +0100 @@ -21,16 +21,16 @@ %define libname libQt5Scxml5 Name: libqt5-qtscxml -Version: 5.12.0 +Version: 5.12.2 Release: 0 Summary: Qt 5 State Chart XML Library License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only Group: System/Libraries Url: http://qt.io %define base_name libqt5 -%define real_version 5.12.0 -%define so_version 5.12.0 -%define tar_version qtscxml-everywhere-src-5.12.0 +%define real_version 5.12.2 +%define so_version 5.12.2 +%define tar_version qtscxml-everywhere-src-5.12.2 Source: https://download.qt.io/official_releases/qt/5.12/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf BuildRequires: libQt5Core-private-headers-devel >= %{version} ++++++ qtscxml-everywhere-src-5.12.0.tar.xz -> qtscxml-everywhere-src-5.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.12.0/.qmake.conf new/qtscxml-everywhere-src-5.12.2/.qmake.conf --- old/qtscxml-everywhere-src-5.12.0/.qmake.conf 2018-11-08 10:29:27.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/.qmake.conf 2019-02-22 08:15:11.000000000 +0100 @@ -2,4 +2,4 @@ CONFIG += qt_example_installs CONFIG += warning_clean -MODULE_VERSION = 5.12.0 +MODULE_VERSION = 5.12.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.12.0/.tag new/qtscxml-everywhere-src-5.12.2/.tag --- old/qtscxml-everywhere-src-5.12.0/.tag 2018-11-08 10:29:27.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/.tag 2019-02-22 08:15:11.000000000 +0100 @@ -1 +1 @@ -1a05d2a375020bb30c9dc02f8ece93ee8becec2e +4bb7aa3f3002b9ba85494e5cf4808f68e0edc502 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.12.0/dist/changes-5.11.3 new/qtscxml-everywhere-src-5.12.2/dist/changes-5.11.3 --- old/qtscxml-everywhere-src-5.12.0/dist/changes-5.11.3 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/dist/changes-5.11.3 2019-02-22 08:15:11.000000000 +0100 @@ -0,0 +1,20 @@ +Qt 5.11.3 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.11.0 through 5.11.2. + +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.11 series is binary compatible with the 5.10.x series. +Applications compiled for 5.10 will continue to run with 5.11. + +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.12.0/dist/changes-5.12.1 new/qtscxml-everywhere-src-5.12.2/dist/changes-5.12.1 --- old/qtscxml-everywhere-src-5.12.0/dist/changes-5.12.1 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/dist/changes-5.12.1 2019-02-22 08:15:11.000000000 +0100 @@ -0,0 +1,25 @@ +Qt 5.12.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.12.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.12 series is binary compatible with the 5.11.x series. +Applications compiled for 5.11 will continue to run with 5.12. + +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.12.1 Changes * +**************************************************************************** + + - [QTBUG-71746] <log> tags with empty or bad expressions are not ignored + anymore. Rather, an empty string is printed. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.12.0/dist/changes-5.12.2 new/qtscxml-everywhere-src-5.12.2/dist/changes-5.12.2 --- old/qtscxml-everywhere-src-5.12.0/dist/changes-5.12.2 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/dist/changes-5.12.2 2019-02-22 08:15:11.000000000 +0100 @@ -0,0 +1,20 @@ +Qt 5.12.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.12.0 through 5.12.1. + +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.12 series is binary compatible with the 5.11.x series. +Applications compiled for 5.11 will continue to run with 5.12. + +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.12.0/examples/scxml/scxml.pro new/qtscxml-everywhere-src-5.12.2/examples/scxml/scxml.pro --- old/qtscxml-everywhere-src-5.12.0/examples/scxml/scxml.pro 2018-11-08 10:29:27.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/examples/scxml/scxml.pro 2019-02-22 08:15:11.000000000 +0100 @@ -10,7 +10,7 @@ SUBDIRS += sudoku } -qtHaveModule(qml) { +qtHaveModule(quick) { SUBDIRS += calculator-qml SUBDIRS += trafficlight-qml-static SUBDIRS += trafficlight-qml-dynamic diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.0/QtScxml/private/qscxmlcompiler_p.h new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.0/QtScxml/private/qscxmlcompiler_p.h --- old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.0/QtScxml/private/qscxmlcompiler_p.h 2018-11-08 10:29:27.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.0/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-everywhere-src-5.12.0/include/QtScxml/5.12.0/QtScxml/private/qscxmlcppdatamodel_p.h new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.0/QtScxml/private/qscxmlcppdatamodel_p.h --- old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.0/QtScxml/private/qscxmlcppdatamodel_p.h 2018-11-08 10:29:27.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.0/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-everywhere-src-5.12.0/include/QtScxml/5.12.0/QtScxml/private/qscxmldatamodel_p.h new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.0/QtScxml/private/qscxmldatamodel_p.h --- old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.0/QtScxml/private/qscxmldatamodel_p.h 2018-11-08 10:29:27.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.0/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-everywhere-src-5.12.0/include/QtScxml/5.12.0/QtScxml/private/qscxmlecmascriptplatformproperties_p.h new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.0/QtScxml/private/qscxmlecmascriptplatformproperties_p.h --- old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.0/QtScxml/private/qscxmlecmascriptplatformproperties_p.h 2018-11-08 10:29:27.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.0/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-everywhere-src-5.12.0/include/QtScxml/5.12.0/QtScxml/private/qscxmlevent_p.h new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.0/QtScxml/private/qscxmlevent_p.h --- old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.0/QtScxml/private/qscxmlevent_p.h 2018-11-08 10:29:27.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.0/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-everywhere-src-5.12.0/include/QtScxml/5.12.0/QtScxml/private/qscxmlexecutablecontent_p.h new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.0/QtScxml/private/qscxmlexecutablecontent_p.h --- old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.0/QtScxml/private/qscxmlexecutablecontent_p.h 2018-11-08 10:29:27.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.0/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-everywhere-src-5.12.0/include/QtScxml/5.12.0/QtScxml/private/qscxmlglobals_p.h new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.0/QtScxml/private/qscxmlglobals_p.h --- old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.0/QtScxml/private/qscxmlglobals_p.h 2018-11-08 10:29:27.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.0/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-everywhere-src-5.12.0/include/QtScxml/5.12.0/QtScxml/private/qscxmlinvokableservice_p.h new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.0/QtScxml/private/qscxmlinvokableservice_p.h --- old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.0/QtScxml/private/qscxmlinvokableservice_p.h 2018-11-08 10:29:27.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.0/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-everywhere-src-5.12.0/include/QtScxml/5.12.0/QtScxml/private/qscxmlstatemachine_p.h new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.0/QtScxml/private/qscxmlstatemachine_p.h --- old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.0/QtScxml/private/qscxmlstatemachine_p.h 2018-11-08 10:29:27.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.0/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-everywhere-src-5.12.0/include/QtScxml/5.12.0/QtScxml/private/qscxmlstatemachineinfo_p.h new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.0/QtScxml/private/qscxmlstatemachineinfo_p.h --- old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.0/QtScxml/private/qscxmlstatemachineinfo_p.h 2018-11-08 10:29:27.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.0/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-everywhere-src-5.12.0/include/QtScxml/5.12.0/QtScxml/private/qscxmltabledata_p.h new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.0/QtScxml/private/qscxmltabledata_p.h --- old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.0/QtScxml/private/qscxmltabledata_p.h 2018-11-08 10:29:27.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.0/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-everywhere-src-5.12.0/include/QtScxml/5.12.2/QtScxml/private/qscxmlcompiler_p.h new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.2/QtScxml/private/qscxmlcompiler_p.h --- old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.2/QtScxml/private/qscxmlcompiler_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.2/QtScxml/private/qscxmlcompiler_p.h 2019-02-22 08:15:11.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/scxml/qscxmlcompiler_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.2/QtScxml/private/qscxmlcppdatamodel_p.h new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.2/QtScxml/private/qscxmlcppdatamodel_p.h --- old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.2/QtScxml/private/qscxmlcppdatamodel_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.2/QtScxml/private/qscxmlcppdatamodel_p.h 2019-02-22 08:15:11.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/scxml/qscxmlcppdatamodel_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.2/QtScxml/private/qscxmldatamodel_p.h new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.2/QtScxml/private/qscxmldatamodel_p.h --- old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.2/QtScxml/private/qscxmldatamodel_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.2/QtScxml/private/qscxmldatamodel_p.h 2019-02-22 08:15:11.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/scxml/qscxmldatamodel_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.2/QtScxml/private/qscxmlecmascriptplatformproperties_p.h new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.2/QtScxml/private/qscxmlecmascriptplatformproperties_p.h --- old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.2/QtScxml/private/qscxmlecmascriptplatformproperties_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.2/QtScxml/private/qscxmlecmascriptplatformproperties_p.h 2019-02-22 08:15:11.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/scxml/qscxmlecmascriptplatformproperties_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.2/QtScxml/private/qscxmlevent_p.h new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.2/QtScxml/private/qscxmlevent_p.h --- old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.2/QtScxml/private/qscxmlevent_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.2/QtScxml/private/qscxmlevent_p.h 2019-02-22 08:15:11.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/scxml/qscxmlevent_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.2/QtScxml/private/qscxmlexecutablecontent_p.h new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.2/QtScxml/private/qscxmlexecutablecontent_p.h --- old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.2/QtScxml/private/qscxmlexecutablecontent_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.2/QtScxml/private/qscxmlexecutablecontent_p.h 2019-02-22 08:15:11.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/scxml/qscxmlexecutablecontent_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.2/QtScxml/private/qscxmlglobals_p.h new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.2/QtScxml/private/qscxmlglobals_p.h --- old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.2/QtScxml/private/qscxmlglobals_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.2/QtScxml/private/qscxmlglobals_p.h 2019-02-22 08:15:11.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/scxml/qscxmlglobals_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.2/QtScxml/private/qscxmlinvokableservice_p.h new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.2/QtScxml/private/qscxmlinvokableservice_p.h --- old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.2/QtScxml/private/qscxmlinvokableservice_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.2/QtScxml/private/qscxmlinvokableservice_p.h 2019-02-22 08:15:11.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/scxml/qscxmlinvokableservice_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.2/QtScxml/private/qscxmlstatemachine_p.h new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.2/QtScxml/private/qscxmlstatemachine_p.h --- old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.2/QtScxml/private/qscxmlstatemachine_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.2/QtScxml/private/qscxmlstatemachine_p.h 2019-02-22 08:15:11.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/scxml/qscxmlstatemachine_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.2/QtScxml/private/qscxmlstatemachineinfo_p.h new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.2/QtScxml/private/qscxmlstatemachineinfo_p.h --- old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.2/QtScxml/private/qscxmlstatemachineinfo_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.2/QtScxml/private/qscxmlstatemachineinfo_p.h 2019-02-22 08:15:11.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/scxml/qscxmlstatemachineinfo_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.2/QtScxml/private/qscxmltabledata_p.h new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.2/QtScxml/private/qscxmltabledata_p.h --- old/qtscxml-everywhere-src-5.12.0/include/QtScxml/5.12.2/QtScxml/private/qscxmltabledata_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/include/QtScxml/5.12.2/QtScxml/private/qscxmltabledata_p.h 2019-02-22 08:15:11.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/scxml/qscxmltabledata_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.12.0/include/QtScxml/qtscxmlversion.h new/qtscxml-everywhere-src-5.12.2/include/QtScxml/qtscxmlversion.h --- old/qtscxml-everywhere-src-5.12.0/include/QtScxml/qtscxmlversion.h 2018-12-04 04:08:59.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/include/QtScxml/qtscxmlversion.h 2019-03-11 14:59:10.000000000 +0100 @@ -2,8 +2,8 @@ #ifndef QT_QTSCXML_VERSION_H #define QT_QTSCXML_VERSION_H -#define QTSCXML_VERSION_STR "5.12.0" +#define QTSCXML_VERSION_STR "5.12.2" -#define QTSCXML_VERSION 0x050C00 +#define QTSCXML_VERSION 0x050C02 #endif // QT_QTSCXML_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.12.0/src/scxml/qscxmlexecutablecontent.cpp new/qtscxml-everywhere-src-5.12.2/src/scxml/qscxmlexecutablecontent.cpp --- old/qtscxml-everywhere-src-5.12.0/src/scxml/qscxmlexecutablecontent.cpp 2018-11-08 10:29:27.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/src/scxml/qscxmlexecutablecontent.cpp 2019-02-22 08:15:11.000000000 +0100 @@ -434,18 +434,20 @@ qCDebug(qscxmlLog) << stateMachine << "Executing log step"; const Log *log = reinterpret_cast<const Log *>(instr); ip += log->size(); + QString str; if (log->expr != NoEvaluator) { - const QString str = dataModel->evaluateToString(log->expr, ok); - if (*ok) { - const QString label = tableData->string(log->label); - qCDebug(scxmlLog) << label << ":" << str; - QMetaObject::invokeMethod(stateMachine, - "log", - Qt::QueuedConnection, - Q_ARG(QString, label), - Q_ARG(QString, str)); - } + str = dataModel->evaluateToString(log->expr, ok); + if (!*ok) + qCWarning(qscxmlLog) << stateMachine << "Could not evaluate <log> expr to string."; } + + const QString label = tableData->string(log->label); + qCDebug(scxmlLog) << label << ":" << str; + QMetaObject::invokeMethod(stateMachine, + "log", + Qt::QueuedConnection, + Q_ARG(QString, label), + Q_ARG(QString, str)); return ip; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.12.0/tests/auto/statemachine/emptylog.scxml new/qtscxml-everywhere-src-5.12.2/tests/auto/statemachine/emptylog.scxml --- old/qtscxml-everywhere-src-5.12.0/tests/auto/statemachine/emptylog.scxml 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/tests/auto/statemachine/emptylog.scxml 2019-02-22 08:15:11.000000000 +0100 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<scxml xmlns="http://www.w3.org/2005/07/scxml"; version="1.0" name="qtbug71746.scxml"> + <state id="failing"> + <onentry> + <log label="Hi2"/> + </onentry> + </state> +</scxml> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.12.0/tests/auto/statemachine/tst_statemachine.cpp new/qtscxml-everywhere-src-5.12.2/tests/auto/statemachine/tst_statemachine.cpp --- old/qtscxml-everywhere-src-5.12.0/tests/auto/statemachine/tst_statemachine.cpp 2018-11-08 10:29:27.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/tests/auto/statemachine/tst_statemachine.cpp 2019-02-22 08:15:11.000000000 +0100 @@ -56,6 +56,7 @@ void invokeStateMachine(); void multipleInvokableServices(); // QTBUG-61484 + void logWithoutExpr(); }; void tst_StateMachine::stateNames_data() @@ -443,6 +444,17 @@ QVERIFY(stateMachine->activeStateNames(true).contains(QLatin1String("success"))); } +void tst_StateMachine::logWithoutExpr() +{ + QScopedPointer<QScxmlStateMachine> stateMachine( + QScxmlStateMachine::fromFile(QString(":/tst_statemachine/emptylog.scxml"))); + QVERIFY(!stateMachine.isNull()); + QTest::ignoreMessage(QtDebugMsg, "\"Hi2\" : \"\""); + stateMachine->start(); + QSignalSpy logSpy(stateMachine.data(), SIGNAL(log(QString,QString))); + QTRY_COMPARE(logSpy.count(), 1); +} + QTEST_MAIN(tst_StateMachine) #include "tst_statemachine.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.12.0/tests/auto/statemachine/tst_statemachine.qrc new/qtscxml-everywhere-src-5.12.2/tests/auto/statemachine/tst_statemachine.qrc --- old/qtscxml-everywhere-src-5.12.0/tests/auto/statemachine/tst_statemachine.qrc 2018-11-08 10:29:27.000000000 +0100 +++ new/qtscxml-everywhere-src-5.12.2/tests/auto/statemachine/tst_statemachine.qrc 2019-02-22 08:15:11.000000000 +0100 @@ -8,5 +8,6 @@ <file>invoke.scxml</file> <file>historystate.scxml</file> <file>multipleinvokableservices.scxml</file> + <file>emptylog.scxml</file> </qresource> </RCC>
