Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-scxml for openSUSE:Factory checked in at 2024-10-17 18:37:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-scxml (Old) and /work/SRC/openSUSE:Factory/.qt6-scxml.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-scxml" Thu Oct 17 18:37:54 2024 rev:29 rq:1207628 version:6.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-scxml/qt6-scxml.changes 2024-10-03 18:03:06.240991065 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-scxml.new.19354/qt6-scxml.changes 2024-10-17 18:38:01.842982386 +0200 @@ -1,0 +2,6 @@ +Tue Oct 8 09:29:51 UTC 2024 - Christophe Marin <christo...@krop.fr> + +- Update to 6.8.0: + * https://www.qt.io/blog/qt-6.8-released + +------------------------------------------------------------------- Old: ---- qtscxml-everywhere-src-6.7.3.tar.xz New: ---- qtscxml-everywhere-src-6.8.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-scxml.spec ++++++ --- /var/tmp/diff_new_pack.1vj13h/_old 2024-10-17 18:38:02.423006572 +0200 +++ /var/tmp/diff_new_pack.1vj13h/_new 2024-10-17 18:38:02.423006572 +0200 @@ -1,7 +1,7 @@ # # spec file for package qt6-scxml # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,8 @@ # -%define real_version 6.7.3 -%define short_version 6.7 +%define real_version 6.8.0 +%define short_version 6.8 %define short_name qtscxml %define tar_name qtscxml-everywhere-src %define tar_suffix %{nil} @@ -28,7 +28,7 @@ %endif # Name: qt6-scxml%{?pkg_suffix} -Version: 6.7.3 +Version: 6.8.0 Release: 0 Summary: SCXML (state machine notation) compiler and related tools License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) ++++++ qtscxml-everywhere-src-6.7.3.tar.xz -> qtscxml-everywhere-src-6.8.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/.cmake.conf new/qtscxml-everywhere-src-6.8.0/.cmake.conf --- old/qtscxml-everywhere-src-6.7.3/.cmake.conf 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/.cmake.conf 2024-10-02 16:25:33.000000000 +0200 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.7.3") +set(QT_REPO_MODULE_VERSION "6.8.0") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/.tag new/qtscxml-everywhere-src-6.8.0/.tag --- old/qtscxml-everywhere-src-6.7.3/.tag 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/.tag 2024-10-02 16:25:33.000000000 +0200 @@ -1 +1 @@ -3b0ed59f2c2aeed0a538217398cc7cff8bbff0ee +b54f02c748804584024a28c676b41dfc43e118e3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/dependencies.yaml new/qtscxml-everywhere-src-6.8.0/dependencies.yaml --- old/qtscxml-everywhere-src-6.7.3/dependencies.yaml 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/dependencies.yaml 2024-10-02 16:25:33.000000000 +0200 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: 92b685784960eea6eb353688cf0edeb94d69c6cd + ref: b839e9b36db3a4e50dfb34521d8ef8de1fd01969 required: true ../qtdeclarative: - ref: 34ffe0c15a9564fefcf01a738eb0bde370399959 + ref: 2884c601242f030307a5acdca984b3aa0d34e064 required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/examples/scxml/sudoku/mainwindow.cpp new/qtscxml-everywhere-src-6.8.0/examples/scxml/sudoku/mainwindow.cpp --- old/qtscxml-everywhere-src-6.7.3/examples/scxml/sudoku/mainwindow.cpp 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/examples/scxml/sudoku/mainwindow.cpp 2024-10-02 16:25:33.000000000 +0200 @@ -187,6 +187,4 @@ } } }); - - setLayout(layout); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxml/CMakeLists.txt new/qtscxml-everywhere-src-6.8.0/src/scxml/CMakeLists.txt --- old/qtscxml-everywhere-src-6.7.3/src/scxml/CMakeLists.txt 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/scxml/CMakeLists.txt 2024-10-02 16:25:33.000000000 +0200 @@ -34,8 +34,6 @@ Qt::Core PRIVATE_MODULE_INTERFACE Qt::CorePrivate - GENERATE_CPP_EXPORTS - GENERATE_PRIVATE_CPP_EXPORTS ) # Install the public qscxlmc.prf file that is used by the qmake diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxml/doc/qtscxml-index.qdoc new/qtscxml-everywhere-src-6.8.0/src/scxml/doc/qtscxml-index.qdoc --- old/qtscxml-everywhere-src-6.7.3/src/scxml/doc/qtscxml-index.qdoc 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/scxml/doc/qtscxml-index.qdoc 2024-10-02 16:25:33.000000000 +0200 @@ -15,6 +15,8 @@ \section1 Getting Started + To use Qt SCXML, install the \e {Qt State Machines} additional library. + To import the QML types into your application, use the following import statement in your .qml file: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxml/qscxmldatamodelplugin_p.h new/qtscxml-everywhere-src-6.8.0/src/scxml/qscxmldatamodelplugin_p.h --- old/qtscxml-everywhere-src-6.7.3/src/scxml/qscxmldatamodelplugin_p.h 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/scxml/qscxmldatamodelplugin_p.h 2024-10-02 16:25:33.000000000 +0200 @@ -23,7 +23,7 @@ #define QScxmlDataModelPluginInterface_iid "org.qt-project.qt.scxml.datamodel.plugin" -class Q_SCXML_PRIVATE_EXPORT QScxmlDataModelPlugin : public QObject +class Q_SCXML_EXPORT QScxmlDataModelPlugin : public QObject { Q_OBJECT public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxml/qscxmlglobals_p.h new/qtscxml-everywhere-src-6.8.0/src/scxml/qscxmlglobals_p.h --- old/qtscxml-everywhere-src-6.7.3/src/scxml/qscxmlglobals_p.h 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/scxml/qscxmlglobals_p.h 2024-10-02 16:25:33.000000000 +0200 @@ -16,13 +16,6 @@ // #include "qscxmlglobals.h" - -#if defined(BUILD_QSCXMLC) -# define Q_SCXML_PRIVATE_EXPORT -#else -# include <QtScxml/private/qtscxmlexports_p.h> -#endif - #include <QtCore/qloggingcategory.h> QT_BEGIN_NAMESPACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxml/qscxmlstatemachine.cpp new/qtscxml-everywhere-src-6.8.0/src/scxml/qscxmlstatemachine.cpp --- old/qtscxml-everywhere-src-6.7.3/src/scxml/qscxmlstatemachine.cpp 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/scxml/qscxmlstatemachine.cpp 2024-10-02 16:25:33.000000000 +0200 @@ -43,7 +43,7 @@ /*! \qmltype ScxmlStateMachine - \instantiates QScxmlStateMachine + \nativetype QScxmlStateMachine \inqmlmodule QtScxml \since 5.7 @@ -2252,20 +2252,28 @@ */ /*! - Starts this state machine. The machine will reset its configuration and - transition to the initial state. When a final top-level state + Starts this state machine. When a final top-level state is entered, the machine will emit the finished() signal. \note A state machine will not run without a running event loop, such as the main application event loop started with QCoreApplication::exec() or QApplication::exec(). + \note Calling start() after stop() will not result in a full reset of its + configuration yet, hence it is strongly advised not to do it. + + \note Starting a finished machine yields a warning. + \sa runningChanged(), setRunning(), stop(), finished() */ void QScxmlStateMachine::start() { Q_D(QScxmlStateMachine); + if (d->isFinished()) { + qCWarning(qscxmlLog) << this << "Can't start finished machine"; + } + if (!parseErrors().isEmpty()) return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxml/qscxmlstatemachine_p.h new/qtscxml-everywhere-src-6.8.0/src/scxml/qscxmlstatemachine_p.h --- old/qtscxml-everywhere-src-6.7.3/src/scxml/qscxmlstatemachine_p.h 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/scxml/qscxmlstatemachine_p.h 2024-10-02 16:25:33.000000000 +0200 @@ -89,7 +89,7 @@ } // QScxmlInternal namespace class QScxmlInvokableService; -class Q_SCXML_PRIVATE_EXPORT QScxmlStateMachinePrivate: public QObjectPrivate +class Q_SCXML_EXPORT QScxmlStateMachinePrivate: public QObjectPrivate { Q_DECLARE_PUBLIC(QScxmlStateMachine) @@ -391,6 +391,7 @@ } bool isPaused() const { return m_runningState == Paused; } + bool isFinished() const { return m_runningState == Finished; } QScxmlInternal::StateMachineInfoProxy *m_infoSignalProxy; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/CMakeLists.txt new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/CMakeLists.txt --- old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/CMakeLists.txt 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/CMakeLists.txt 2024-10-02 16:25:33.000000000 +0200 @@ -24,6 +24,4 @@ Qt::Scxml LIBRARIES Qt::CorePrivate - GENERATE_CPP_EXPORTS - GENERATE_PRIVATE_CPP_EXPORTS ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/eventconnection.cpp new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/eventconnection.cpp --- old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/eventconnection.cpp 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/eventconnection.cpp 2024-10-02 16:25:33.000000000 +0200 @@ -7,7 +7,7 @@ /*! \qmltype EventConnection -//! \instantiates QScxmlEventConnection +//! \nativetype QScxmlEventConnection \inqmlmodule QtScxml \since QtScxml 5.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/eventconnection_p.h new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/eventconnection_p.h --- old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/eventconnection_p.h 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/eventconnection_p.h 2024-10-02 16:25:33.000000000 +0200 @@ -28,7 +28,7 @@ QT_BEGIN_NAMESPACE // QScxmlEvent is used as signal parameter, and defined in the cpp lib -struct Q_SCXMLQML_PRIVATE_EXPORT QScxmlEventForeign +struct Q_SCXMLQML_EXPORT QScxmlEventForeign { Q_GADGET QML_ANONYMOUS @@ -36,7 +36,7 @@ QML_ADDED_IN_VERSION(5,8) }; -class Q_SCXMLQML_PRIVATE_EXPORT QScxmlEventConnection : public QObject, public QQmlParserStatus +class Q_SCXMLQML_EXPORT QScxmlEventConnection : public QObject, public QQmlParserStatus { Q_OBJECT Q_PROPERTY(QStringList events READ events WRITE setEvents NOTIFY eventsChanged diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/invokedservices.cpp new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/invokedservices.cpp --- old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/invokedservices.cpp 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/invokedservices.cpp 2024-10-02 16:25:33.000000000 +0200 @@ -8,7 +8,7 @@ /*! \qmltype InvokedServices -//! \instantiates QScxmlInvokedServices +//! \nativetype QScxmlInvokedServices \inqmlmodule QtScxml \since QtScxml 5.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/invokedservices_p.h new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/invokedservices_p.h --- old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/invokedservices_p.h 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/invokedservices_p.h 2024-10-02 16:25:33.000000000 +0200 @@ -26,7 +26,7 @@ QT_BEGIN_NAMESPACE -class Q_SCXMLQML_PRIVATE_EXPORT QScxmlInvokedServices : public QObject, public QQmlParserStatus +class Q_SCXMLQML_EXPORT QScxmlInvokedServices : public QObject, public QQmlParserStatus { Q_OBJECT Q_PROPERTY(QScxmlStateMachine *stateMachine READ stateMachine WRITE setStateMachine diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/qscxmlqmlglobals_p.h new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/qscxmlqmlglobals_p.h --- old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/qscxmlqmlglobals_p.h 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/qscxmlqmlglobals_p.h 2024-10-02 16:25:33.000000000 +0200 @@ -16,11 +16,11 @@ // #include <QtCore/qglobal.h> -#include <QtScxmlQml/private/qtscxmlqmlexports_p.h> +#include <QtScxmlQml/qtscxmlqmlexports.h> QT_BEGIN_NAMESPACE -void Q_SCXMLQML_PRIVATE_EXPORT qml_register_types_QtScxml(); +void Q_SCXMLQML_EXPORT qml_register_types_QtScxml(); QT_END_NAMESPACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/statemachineextended_p.h new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/statemachineextended_p.h --- old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/statemachineextended_p.h 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/statemachineextended_p.h 2024-10-02 16:25:33.000000000 +0200 @@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE /* Allow State Machines created from QML to have children. */ -class Q_SCXMLQML_PRIVATE_EXPORT QScxmlStateMachineExtended : public QObject +class Q_SCXMLQML_EXPORT QScxmlStateMachineExtended : public QObject { Q_OBJECT Q_PROPERTY(QQmlListProperty<QObject> children READ children) @@ -39,7 +39,7 @@ }; // The QScxmlStateMachine is defined in the scxml library -struct Q_SCXMLQML_PRIVATE_EXPORT QScxmlStateMachineForeign +struct Q_SCXMLQML_EXPORT QScxmlStateMachineForeign { Q_GADGET QML_UNCREATABLE("Only created through derived types") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/statemachineloader.cpp new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/statemachineloader.cpp --- old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/statemachineloader.cpp 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/statemachineloader.cpp 2024-10-02 16:25:33.000000000 +0200 @@ -12,7 +12,7 @@ /*! \qmltype StateMachineLoader -//! \instantiates QScxmlStateMachineLoader +//! \nativetype QScxmlStateMachineLoader \inqmlmodule QtScxml \brief Dynamically loads an SCXML document and instantiates the state machine. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/statemachineloader_p.h new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/statemachineloader_p.h --- old/qtscxml-everywhere-src-6.7.3/src/scxmlqml/statemachineloader_p.h 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/scxmlqml/statemachineloader_p.h 2024-10-02 16:25:33.000000000 +0200 @@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE -class Q_SCXMLQML_PRIVATE_EXPORT QScxmlStateMachineLoader: public QObject +class Q_SCXMLQML_EXPORT QScxmlStateMachineLoader: public QObject { Q_OBJECT Q_PROPERTY(QUrl source READ source WRITE setSource diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/statemachine/CMakeLists.txt new/qtscxml-everywhere-src-6.8.0/src/statemachine/CMakeLists.txt --- old/qtscxml-everywhere-src-6.7.3/src/statemachine/CMakeLists.txt 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/statemachine/CMakeLists.txt 2024-10-02 16:25:33.000000000 +0200 @@ -28,7 +28,6 @@ Qt::Core PRIVATE_MODULE_INTERFACE Qt::CorePrivate - GENERATE_CPP_EXPORTS ) ## Scopes: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/qstatemachine-qml-guide.qdoc new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/qstatemachine-qml-guide.qdoc --- old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/qstatemachine-qml-guide.qdoc 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/qstatemachine-qml-guide.qdoc 2024-10-02 16:25:33.000000000 +0200 @@ -8,8 +8,6 @@ \ingroup technology-apis \ingroup explanation - \tableofcontents - Qt State Machine QML APIs provide types for creating and executing state graphs in QML. It is similar to the C++ State Machine framework based on Harel's diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/qtstatemachine-cpp-guide.qdoc new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/qtstatemachine-cpp-guide.qdoc --- old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/qtstatemachine-cpp-guide.qdoc 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/qtstatemachine-cpp-guide.qdoc 2024-10-02 16:25:33.000000000 +0200 @@ -9,8 +9,6 @@ \ingroup technology-apis \ingroup explanation - \tableofcontents - The State Machine framework provides classes for creating and executing state graphs. This page illustrates the framework's key features in C++. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/qtstatemachine-overview.qdoc new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/qtstatemachine-overview.qdoc --- old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/qtstatemachine-overview.qdoc 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/qtstatemachine-overview.qdoc 2024-10-02 16:25:33.000000000 +0200 @@ -8,8 +8,6 @@ \ingroup technology-apis \ingroup explanation - \tableofcontents - The State Machine framework provides classes for creating and executing state graphs. The concepts and notation are based on those from Harel's \l{http://www.wisdom.weizmann.ac.il/~dharel/SCANNED.PAPERS/Statecharts.pdf}{Statecharts: A visual formalism for complex systems}, which Binary files old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/src/images/animatedtiles-example.png and new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/src/images/animatedtiles-example.png differ Binary files old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/src/images/padnavigator-example.png and new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/src/images/padnavigator-example.png differ Binary files old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/src/images/states-example.png and new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/src/images/states-example.png differ Binary files old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/src/images/stickman-example.png and new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/src/images/stickman-example.png differ Binary files old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/src/images/stickman-example1.png and new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/src/images/stickman-example1.png differ Binary files old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/src/images/stickman-example2.png and new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/src/images/stickman-example2.png differ Binary files old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/src/images/stickman-example3.png and new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/src/images/stickman-example3.png differ Binary files old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/src/images/sub-attaq-demo.png and new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/src/images/sub-attaq-demo.png differ Binary files old/qtscxml-everywhere-src-6.7.3/src/statemachine/doc/src/images/transitions.png and new/qtscxml-everywhere-src-6.8.0/src/statemachine/doc/src/images/transitions.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/CMakeLists.txt new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/CMakeLists.txt --- old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/CMakeLists.txt 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/CMakeLists.txt 2024-10-02 16:25:33.000000000 +0200 @@ -27,6 +27,4 @@ Qt::StateMachine LIBRARIES Qt::QmlPrivate - GENERATE_CPP_EXPORTS - GENERATE_PRIVATE_CPP_EXPORTS ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/finalstate_p.h new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/finalstate_p.h --- old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/finalstate_p.h 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/finalstate_p.h 2024-10-02 16:25:33.000000000 +0200 @@ -27,7 +27,7 @@ QT_BEGIN_NAMESPACE -class Q_STATEMACHINEQML_PRIVATE_EXPORT FinalState : public QFinalState +class Q_STATEMACHINEQML_EXPORT FinalState : public QFinalState { Q_OBJECT Q_PROPERTY(QQmlListProperty<QObject> children READ children diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/qstatemachineqmlglobals_p.h new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/qstatemachineqmlglobals_p.h --- old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/qstatemachineqmlglobals_p.h 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/qstatemachineqmlglobals_p.h 2024-10-02 16:25:33.000000000 +0200 @@ -16,11 +16,11 @@ // #include <QtCore/qglobal.h> -#include <QtStateMachineQml/private/qtstatemachineqmlexports_p.h> +#include <QtStateMachineQml/qtstatemachineqmlexports.h> QT_BEGIN_NAMESPACE -void Q_STATEMACHINEQML_PRIVATE_EXPORT qml_register_types_QtQml_StateMachine(); +void Q_STATEMACHINEQML_EXPORT qml_register_types_QtQml_StateMachine(); QT_END_NAMESPACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/signaltransition_p.h new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/signaltransition_p.h --- old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/signaltransition_p.h 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/signaltransition_p.h 2024-10-02 16:25:33.000000000 +0200 @@ -30,7 +30,7 @@ QT_BEGIN_NAMESPACE -class Q_STATEMACHINEQML_PRIVATE_EXPORT SignalTransition : public QSignalTransition, public QQmlParserStatus +class Q_STATEMACHINEQML_EXPORT SignalTransition : public QSignalTransition, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/state_p.h new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/state_p.h --- old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/state_p.h 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/state_p.h 2024-10-02 16:25:33.000000000 +0200 @@ -26,7 +26,7 @@ QT_BEGIN_NAMESPACE -class Q_STATEMACHINEQML_PRIVATE_EXPORT State : public QState, public QQmlParserStatus +class Q_STATEMACHINEQML_EXPORT State : public QState, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/statemachine_p.h new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/statemachine_p.h --- old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/statemachine_p.h 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/statemachine_p.h 2024-10-02 16:25:33.000000000 +0200 @@ -26,7 +26,7 @@ QT_BEGIN_NAMESPACE -class Q_STATEMACHINEQML_PRIVATE_EXPORT StateMachine : public QStateMachine, public QQmlParserStatus +class Q_STATEMACHINEQML_EXPORT StateMachine : public QStateMachine, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/statemachineforeign_p.h new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/statemachineforeign_p.h --- old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/statemachineforeign_p.h 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/statemachineforeign_p.h 2024-10-02 16:25:33.000000000 +0200 @@ -23,7 +23,7 @@ #include <QtStateMachine/qabstractstate.h> #include <QtStateMachine/qsignaltransition.h> -struct Q_STATEMACHINEQML_PRIVATE_EXPORT QHistoryStateForeign +struct Q_STATEMACHINEQML_EXPORT QHistoryStateForeign { Q_GADGET QML_FOREIGN(QHistoryState) @@ -31,7 +31,7 @@ QML_ADDED_IN_VERSION(1, 0) }; -struct Q_STATEMACHINEQML_PRIVATE_EXPORT QStateForeign +struct Q_STATEMACHINEQML_EXPORT QStateForeign { Q_GADGET QML_FOREIGN(QState) @@ -40,7 +40,7 @@ QML_UNCREATABLE("Don't use this, use State instead.") }; -struct Q_STATEMACHINEQML_PRIVATE_EXPORT QAbstractStateForeign +struct Q_STATEMACHINEQML_EXPORT QAbstractStateForeign { Q_GADGET QML_FOREIGN(QAbstractState) @@ -49,7 +49,7 @@ QML_UNCREATABLE("Don't use this, use State instead.") }; -struct Q_STATEMACHINEQML_PRIVATE_EXPORT QSignalTransitionForeign +struct Q_STATEMACHINEQML_EXPORT QSignalTransitionForeign { Q_GADGET QML_FOREIGN(QSignalTransition) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/timeouttransition_p.h new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/timeouttransition_p.h --- old/qtscxml-everywhere-src-6.7.3/src/statemachineqml/timeouttransition_p.h 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/src/statemachineqml/timeouttransition_p.h 2024-10-02 16:25:33.000000000 +0200 @@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE class QTimer; -class Q_STATEMACHINEQML_PRIVATE_EXPORT TimeoutTransition : public QSignalTransition, public QQmlParserStatus +class Q_STATEMACHINEQML_EXPORT TimeoutTransition : public QSignalTransition, public QQmlParserStatus { Q_OBJECT Q_PROPERTY(int timeout READ timeout WRITE setTimeout BINDABLE bindableTimeout) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/tests/auto/statemachine/tst_statemachine.cpp new/qtscxml-everywhere-src-6.8.0/tests/auto/statemachine/tst_statemachine.cpp --- old/qtscxml-everywhere-src-6.7.3/tests/auto/statemachine/tst_statemachine.cpp 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/tests/auto/statemachine/tst_statemachine.cpp 2024-10-02 16:25:33.000000000 +0200 @@ -31,6 +31,7 @@ void doneDotStateEvent(); void running(); + void restart(); void invokeStateMachine(); @@ -392,6 +393,24 @@ QCOMPARE(stateMachine->isRunning(), false); } +void tst_StateMachine::restart() +{ + QScopedPointer<QScxmlStateMachine> stateMachine( + QScxmlStateMachine::fromFile(QString(":/tst_statemachine/stateDotDoneEvent.scxml"))); + QVERIFY(!stateMachine.isNull()); + + QSignalSpy finishedSpy(stateMachine.data(), SIGNAL(finished())); + + stateMachine->start(); + finishedSpy.wait(5000); + QCOMPARE(finishedSpy.size(), 1); + QCOMPARE(stateMachine->activeStateNames(true).size(), 1); + QVERIFY(stateMachine->activeStateNames(true).contains(QLatin1String("success"))); + + QTest::ignoreMessage(QtWarningMsg, QRegularExpression("(.*)Can't start finished machine")); + stateMachine->start(); +} + void tst_StateMachine::invokeStateMachine() { QScopedPointer<QScxmlStateMachine> stateMachine( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/generator.cpp new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/generator.cpp --- old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/generator.cpp 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/generator.cpp 2024-10-02 16:25:33.000000000 +0200 @@ -877,7 +877,7 @@ // if (cdef->propertyList.size()) - fprintf(out, "\n // properties: name, type, flags\n"); + fprintf(out, "\n // properties: name, type, flags, notifyId, revision\n"); for (const PropertyDef &p : std::as_const(cdef->propertyList)) { uint flags = Invalid; if (!isBuiltinType(p.type)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc.cpp new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc.cpp --- old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc.cpp 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc.cpp 2024-10-02 16:25:33.000000000 +0200 @@ -79,6 +79,7 @@ } } def->classname = name; + def->lineNumber = symbol().lineNum; if (test(IDENTIFIER)) { const QByteArray lex = lexem(); @@ -437,7 +438,7 @@ // note that testFunctionAttribute is handled further below, // and revisions and attributes must come first while (testForFunctionModifiers(def)) {} - Type tempType = parseType();; + Type tempType = parseType(); while (!tempType.name.isEmpty() && lookup() != LPAREN) { if (testFunctionAttribute(def->type.firstToken, def)) ; // fine @@ -555,7 +556,7 @@ // but otherwise we end up with misparses if (def->isSlot || def->isSignal || def->isInvokable) while (testForFunctionModifiers(def)) {} - Type tempType = parseType();; + Type tempType = parseType(); while (!tempType.name.isEmpty() && lookup() != LPAREN) { if (testFunctionAttribute(def->type.firstToken, def)) ; // fine @@ -692,6 +693,7 @@ } else if (!test(SEMIC)) { NamespaceDef def; def.classname = nsName; + def.lineNumber = symbol().lineNum; def.doGenerate = currentFilenames.size() <= 1; next(LBRACE); @@ -2005,6 +2007,7 @@ QJsonObject cls; cls["className"_L1] = QString::fromUtf8(classname.constData()); cls["qualifiedClassName"_L1] = QString::fromUtf8(qualified.constData()); + cls["lineNumber"_L1] = lineNumber; QJsonArray classInfos; for (const auto &info: std::as_const(classInfoList)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc.h new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc.h --- old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc.h 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc.h 2024-10-02 16:25:33.000000000 +0200 @@ -163,6 +163,7 @@ QMap<QByteArray, QByteArray> flagAliases; qsizetype begin = 0; qsizetype end = 0; + qsizetype lineNumber = 0; }; struct SuperClass { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc_patches/generator.cpp.patch new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc_patches/generator.cpp.patch --- old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc_patches/generator.cpp.patch 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc_patches/generator.cpp.patch 2024-10-02 16:25:33.000000000 +0200 @@ -1,5 +1,5 @@ ---- .upstream/generator.cpp 2024-02-01 11:08:00.055494626 +0100 -+++ generator.cpp 2024-02-05 14:18:32.229391845 +0100 +--- .upstream/generator.cpp 2024-05-08 08:57:34.586091856 +0200 ++++ generator.cpp 2024-08-05 16:00:04.723392397 +0200 @@ -4,7 +4,9 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc_patches/generator.h.patch new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc_patches/generator.h.patch --- old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc_patches/generator.h.patch 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc_patches/generator.h.patch 2024-10-02 16:25:33.000000000 +0200 @@ -1,5 +1,5 @@ ---- .upstream/generator.h 2023-06-22 20:40:43.078529554 +0200 -+++ generator.h 2024-02-05 14:06:04.258179059 +0100 +--- .upstream/generator.h 2023-06-22 08:29:43.218633538 +0200 ++++ generator.h 2024-08-05 16:00:04.719392449 +0200 @@ -6,23 +6,34 @@ #include "moc.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc_patches/moc.cpp.patch new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc_patches/moc.cpp.patch --- old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc_patches/moc.cpp.patch 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc_patches/moc.cpp.patch 2024-10-02 16:25:33.000000000 +0200 @@ -1,5 +1,5 @@ ---- .upstream/moc.cpp 2024-02-01 11:08:00.055494626 +0100 -+++ moc.cpp 2024-02-05 14:06:04.258179059 +0100 +--- .upstream/moc.cpp 2024-08-05 12:14:28.111250492 +0200 ++++ moc.cpp 2024-08-05 16:00:04.711392552 +0200 @@ -12,14 +12,15 @@ #include <QtCore/qdir.h> #include <QtCore/qjsondocument.h> @@ -19,7 +19,7 @@ // only moc needs this function static QByteArray normalizeType(const QByteArray &ba) { -@@ -1997,6 +1998,7 @@ +@@ -1999,6 +2000,7 @@ } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc_patches/moc.h.patch new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc_patches/moc.h.patch --- old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc_patches/moc.h.patch 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc_patches/moc.h.patch 2024-10-02 16:25:33.000000000 +0200 @@ -1,5 +1,5 @@ ---- .upstream/moc.h 2024-02-05 14:10:55.937714571 +0100 -+++ moc.h 2024-02-05 14:12:52.133597464 +0100 +--- .upstream/moc.h 2024-08-05 12:14:28.111250492 +0200 ++++ moc.h 2024-08-05 16:00:04.715392500 +0200 @@ -4,14 +4,12 @@ #ifndef MOC_H #define MOC_H @@ -76,7 +76,7 @@ }; Q_DECLARE_TYPEINFO(PropertyDef, Q_RELOCATABLE_TYPE); -@@ -204,6 +214,7 @@ +@@ -205,6 +215,7 @@ }; Q_DECLARE_TYPEINFO(NamespaceDef, Q_RELOCATABLE_TYPE); @@ -84,7 +84,7 @@ class Moc : public Parser { public: -@@ -293,6 +304,7 @@ +@@ -294,6 +305,7 @@ void checkListSizes(const ClassDef &def); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc_patches/outputrevision.h.patch new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc_patches/outputrevision.h.patch --- old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/moc_patches/outputrevision.h.patch 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/moc_patches/outputrevision.h.patch 2024-10-02 16:25:33.000000000 +0200 @@ -1,5 +1,5 @@ ---- .upstream/outputrevision.h 2022-05-23 08:46:14.490945334 +0200 -+++ outputrevision.h 2024-02-05 14:06:04.254179068 +0100 +--- .upstream/outputrevision.h 2022-07-14 10:20:51.543950028 +0200 ++++ outputrevision.h 2024-08-05 16:00:04.703392655 +0200 @@ -4,7 +4,13 @@ #ifndef OUTPUTREVISION_H #define OUTPUTREVISION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/qscxmlc.h new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/qscxmlc.h --- old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/qscxmlc.h 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/qscxmlc.h 2024-10-02 16:25:33.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #ifndef QSCXMLC_H #define QSCXMLC_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/utils.h new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/utils.h --- old/qtscxml-everywhere-src-6.7.3/tools/qscxmlc/utils.h 2024-09-19 20:58:59.000000000 +0200 +++ new/qtscxml-everywhere-src-6.8.0/tools/qscxmlc/utils.h 2024-10-02 16:25:33.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #ifndef UTILS_H #define UTILS_H
