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 2025-02-03 21:41:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-scxml (Old) and /work/SRC/openSUSE:Factory/.qt6-scxml.new.2316 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-scxml" Mon Feb 3 21:41:10 2025 rev:31 rq:1242064 version:6.8.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-scxml/qt6-scxml.changes 2024-12-05 17:06:38.664577193 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-scxml.new.2316/qt6-scxml.changes 2025-02-03 21:41:25.877310830 +0100 @@ -1,0 +2,6 @@ +Fri Jan 31 10:22:59 UTC 2025 - Christophe Marin <[email protected]> + +- Update to 6.8.2 + https://www.qt.io/blog/qt-6.8.2-released + +------------------------------------------------------------------- Old: ---- qtscxml-everywhere-src-6.8.1.tar.xz New: ---- qtscxml-everywhere-src-6.8.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-scxml.spec ++++++ --- /var/tmp/diff_new_pack.UjuoWL/_old 2025-02-03 21:41:26.741346642 +0100 +++ /var/tmp/diff_new_pack.UjuoWL/_new 2025-02-03 21:41:26.745346808 +0100 @@ -16,7 +16,7 @@ # -%define real_version 6.8.1 +%define real_version 6.8.2 %define short_version 6.8 %define short_name qtscxml %define tar_name qtscxml-everywhere-src @@ -28,7 +28,7 @@ %endif # Name: qt6-scxml%{?pkg_suffix} -Version: 6.8.1 +Version: 6.8.2 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.8.1.tar.xz -> qtscxml-everywhere-src-6.8.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.8.1/.cmake.conf new/qtscxml-everywhere-src-6.8.2/.cmake.conf --- old/qtscxml-everywhere-src-6.8.1/.cmake.conf 2024-11-21 04:34:03.000000000 +0100 +++ new/qtscxml-everywhere-src-6.8.2/.cmake.conf 2025-01-24 10:11:49.000000000 +0100 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.8.1") +set(QT_REPO_MODULE_VERSION "6.8.2") 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.8.1/.tag new/qtscxml-everywhere-src-6.8.2/.tag --- old/qtscxml-everywhere-src-6.8.1/.tag 2024-11-21 04:34:03.000000000 +0100 +++ new/qtscxml-everywhere-src-6.8.2/.tag 2025-01-24 10:11:49.000000000 +0100 @@ -1 +1 @@ -243adedab23bc37a3b156a10133878bf5a977a03 +d255c0103bdaba66bd8b7d4ba2b50d877935bf31 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.8.1/CMakeLists.txt new/qtscxml-everywhere-src-6.8.2/CMakeLists.txt --- old/qtscxml-everywhere-src-6.8.1/CMakeLists.txt 2024-11-21 04:34:03.000000000 +0100 +++ new/qtscxml-everywhere-src-6.8.2/CMakeLists.txt 2025-01-24 10:11:49.000000000 +0100 @@ -12,7 +12,8 @@ ) find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) -find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Gui Qml Widgets OpenGL OpenGLWidgets Network QuickTest) +find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Gui Qml QuickTest) +find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Widgets Network) qt_internal_project_setup() qt_internal_define_repo_target_set(qtscxml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.8.1/dependencies.yaml new/qtscxml-everywhere-src-6.8.2/dependencies.yaml --- old/qtscxml-everywhere-src-6.8.1/dependencies.yaml 2024-11-21 04:34:03.000000000 +0100 +++ new/qtscxml-everywhere-src-6.8.2/dependencies.yaml 2025-01-24 10:11:49.000000000 +0100 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: 0db4321f2f13c6870283f3fcc0f1a462fd7cf663 + ref: f1136de66638060b8a1ab9bc0cdf1a91dcb5ec01 required: true ../qtdeclarative: - ref: b34fca34941ecdbf99819bbf58b45332ac9e6fa7 + ref: 75534f3e7fff24ed7ccb364e2ed9950a73da879f required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.8.1/src/scxml/doc/qtscxml-module-use.qdocinc new/qtscxml-everywhere-src-6.8.2/src/scxml/doc/qtscxml-module-use.qdocinc --- old/qtscxml-everywhere-src-6.8.1/src/scxml/doc/qtscxml-module-use.qdocinc 2024-11-21 04:34:03.000000000 +0100 +++ new/qtscxml-everywhere-src-6.8.2/src/scxml/doc/qtscxml-module-use.qdocinc 2025-01-24 10:11:49.000000000 +0100 @@ -22,7 +22,7 @@ //! [cmakestatecharts] \code - qt6_add_statecharts(mytarget + qt_add_statecharts(mytarget MyStatemachine.scxml ) \endcode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.8.1/src/scxml/doc/qtscxml.qdocconf new/qtscxml-everywhere-src-6.8.2/src/scxml/doc/qtscxml.qdocconf --- old/qtscxml-everywhere-src-6.8.1/src/scxml/doc/qtscxml.qdocconf 2024-11-21 04:34:03.000000000 +0100 +++ new/qtscxml-everywhere-src-6.8.2/src/scxml/doc/qtscxml.qdocconf 2025-01-24 10:11:49.000000000 +0100 @@ -7,7 +7,7 @@ # Install path for the examples examplesinstallpath = scxml -exampledirs = ../../../examples/scxml +exampledirs = ../../../examples/scxml . examples.fileextensions += "*.scxml" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.8.1/src/scxml/doc/snippets/mediaplayer/CMakeLists.txt new/qtscxml-everywhere-src-6.8.2/src/scxml/doc/snippets/mediaplayer/CMakeLists.txt --- old/qtscxml-everywhere-src-6.8.1/src/scxml/doc/snippets/mediaplayer/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-everywhere-src-6.8.2/src/scxml/doc/snippets/mediaplayer/CMakeLists.txt 2025-01-24 10:11:49.000000000 +0100 @@ -0,0 +1,24 @@ +# Copyright (C) 2023 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +cmake_minimum_required(VERSION 3.16) +project(mediaplayerscxml_snippets LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +find_package(Qt6 REQUIRED COMPONENTS Core Scxml) + +qt_standard_project_setup(REQUIRES 6.7) + +qt_add_library(mediaplayerscxml_snippets + thedatamodel.h thedatamodel.cpp +) + +target_link_libraries(mediaplayerscxml_snippets PRIVATE + Qt::Core + Qt::Scxml +) + +qt_add_statecharts(mediaplayerscxml_snippets + mediaplayer.scxml +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.8.1/src/scxml/doc/snippets/mediaplayer/mediaplayer.scxml new/qtscxml-everywhere-src-6.8.2/src/scxml/doc/snippets/mediaplayer/mediaplayer.scxml --- old/qtscxml-everywhere-src-6.8.1/src/scxml/doc/snippets/mediaplayer/mediaplayer.scxml 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-everywhere-src-6.8.2/src/scxml/doc/snippets/mediaplayer/mediaplayer.scxml 2025-01-24 10:11:49.000000000 +0100 @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +--> +<scxml + xmlns="http://www.w3.org/2005/07/scxml"; + version="1.0" + name="MediaPlayerStateMachine" + initial="stopped" + datamodel="cplusplus:TheDataModel:thedatamodel.h" +> + <state id="stopped"> + <transition event="tap" cond="isValidMedia()" target="playing"/> + </state> + + <state id="playing"> + <onentry> + <script> + media = eventData().value(QStringLiteral("media")).toString(); + </script> + <send event="playbackStarted"> + <param name="media" expr="media"/> + </send> + </onentry> + + <onexit> + <send event="playbackStopped"> + <param name="media" expr="media"/> + </send> + </onexit> + + <transition event="tap" cond="!isValidMedia() || media == eventData().value(QStringLiteral("media"))" target="stopped"/> + <transition event="tap" cond="isValidMedia() && media != eventData().value(QStringLiteral("media"))" target="playing"/> + </state> +</scxml> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.8.1/src/scxml/doc/snippets/mediaplayer/thedatamodel.cpp new/qtscxml-everywhere-src-6.8.2/src/scxml/doc/snippets/mediaplayer/thedatamodel.cpp --- old/qtscxml-everywhere-src-6.8.1/src/scxml/doc/snippets/mediaplayer/thedatamodel.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-everywhere-src-6.8.2/src/scxml/doc/snippets/mediaplayer/thedatamodel.cpp 2025-01-24 10:11:49.000000000 +0100 @@ -0,0 +1,19 @@ +// Copyright (C) 2024 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +#include "thedatamodel.h" + +#include <QScxmlEvent> + +using namespace Qt::Literals::StringLiterals; + +bool TheDataModel::isValidMedia() const +{ + QString eventMedia = eventData().value(u"media"_s).toString(); + return eventMedia.size() > 0; +} + +QVariantMap TheDataModel::eventData() const +{ + return QVariantMap(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.8.1/src/scxml/doc/snippets/mediaplayer/thedatamodel.h new/qtscxml-everywhere-src-6.8.2/src/scxml/doc/snippets/mediaplayer/thedatamodel.h --- old/qtscxml-everywhere-src-6.8.1/src/scxml/doc/snippets/mediaplayer/thedatamodel.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtscxml-everywhere-src-6.8.2/src/scxml/doc/snippets/mediaplayer/thedatamodel.h 2025-01-24 10:11:49.000000000 +0100 @@ -0,0 +1,25 @@ +// Copyright (C) 2024 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +#ifndef THEDATAMODEL_H +#define THEDATAMODEL_H + +//! [Declaration1] +#include <QScxmlCppDataModel> + +class TheDataModel: public QScxmlCppDataModel +{ + Q_OBJECT + Q_SCXML_DATAMODEL +//! [Declaration1] + +private: + bool isValidMedia() const; + QVariantMap eventData() const; + + QString media; +//! [Declaration2] +}; +//! [Declaration2] + +#endif // THEDATAMODEL_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.8.1/src/scxml/qscxmlcppdatamodel.cpp new/qtscxml-everywhere-src-6.8.2/src/scxml/qscxmlcppdatamodel.cpp --- old/qtscxml-everywhere-src-6.8.1/src/scxml/qscxmlcppdatamodel.cpp 2024-11-21 04:34:03.000000000 +0100 +++ new/qtscxml-everywhere-src-6.8.2/src/scxml/qscxmlcppdatamodel.cpp 2025-01-24 10:11:49.000000000 +0100 @@ -28,15 +28,11 @@ The format of the \e datamodel attribute is: \c{cplusplus:<class-name>:<classdef-header>}. So, for the example above, there should be a file \e thedatamodel.h containing a subclass of QScxmlCppDataModel, containing at least the following: - \badcode -#include "qscxmlcppdatamodel.h" -class TheDataModel: public QScxmlCppDataModel -{ - \Q_OBJECT - Q_SCXML_DATAMODEL -}; - \endcode + \snippet snippets/mediaplayer/thedatamodel.h Declaration1 + \dots + \snippet snippets/mediaplayer/thedatamodel.h Declaration2 + The Q_SCXML_DATAMODEL has to appear in the private section of the class definition, for example right after the opening bracket, or after a Q_OBJECT macro. This macro expands to the declaration of some virtual diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.8.1/src/statemachineqml/signaltransition.cpp new/qtscxml-everywhere-src-6.8.2/src/statemachineqml/signaltransition.cpp --- old/qtscxml-everywhere-src-6.8.1/src/statemachineqml/signaltransition.cpp 2024-11-21 04:34:03.000000000 +0100 +++ new/qtscxml-everywhere-src-6.8.2/src/statemachineqml/signaltransition.cpp 2025-01-24 10:11:49.000000000 +0100 @@ -186,7 +186,9 @@ } } -void SignalTransitionParser::verifyBindings(const QQmlRefPointer<QV4::ExecutableCompilationUnit> &compilationUnit, const QList<const QV4::CompiledData::Binding *> &props) +void SignalTransitionParser::verifyBindings( + const QQmlRefPointer<QV4::CompiledData::CompilationUnit> &compilationUnit, + const QList<const QV4::CompiledData::Binding *> &props) { for (int ii = 0; ii < props.size(); ++ii) { const QV4::CompiledData::Binding *binding = props.at(ii); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.8.1/src/statemachineqml/signaltransition_p.h new/qtscxml-everywhere-src-6.8.2/src/statemachineqml/signaltransition_p.h --- old/qtscxml-everywhere-src-6.8.1/src/statemachineqml/signaltransition_p.h 2024-11-21 04:34:03.000000000 +0100 +++ new/qtscxml-everywhere-src-6.8.2/src/statemachineqml/signaltransition_p.h 2025-01-24 10:11:49.000000000 +0100 @@ -86,8 +86,12 @@ class SignalTransitionParser : public QQmlCustomParser { public: - void verifyBindings(const QQmlRefPointer<QV4::ExecutableCompilationUnit> &compilationUnit, const QList<const QV4::CompiledData::Binding *> &props) override; - void applyBindings(QObject *object, const QQmlRefPointer<QV4::ExecutableCompilationUnit> &compilationUnit, const QList<const QV4::CompiledData::Binding *> &bindings) override; + void verifyBindings( + const QQmlRefPointer<QV4::CompiledData::CompilationUnit> &compilationUnit, + const QList<const QV4::CompiledData::Binding *> &props) override; + void applyBindings( + QObject *object, const QQmlRefPointer<QV4::ExecutableCompilationUnit> &compilationUnit, + const QList<const QV4::CompiledData::Binding *> &bindings) override; }; template<> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.8.1/tests/auto/qstatemachine/qstatemachine/tst_qstatemachine.cpp new/qtscxml-everywhere-src-6.8.2/tests/auto/qstatemachine/qstatemachine/tst_qstatemachine.cpp --- old/qtscxml-everywhere-src-6.8.1/tests/auto/qstatemachine/qstatemachine/tst_qstatemachine.cpp 2024-11-21 04:34:03.000000000 +0100 +++ new/qtscxml-everywhere-src-6.8.2/tests/auto/qstatemachine/qstatemachine/tst_qstatemachine.cpp 2025-01-24 10:11:49.000000000 +0100 @@ -74,6 +74,17 @@ QCOMPARE(VAR->active(), !active); \ } +#define TEST_ACTIVE_CHANGED_SPY_ONLY(VAR, COUNT) \ +{ \ + QTRY_COMPARE(VAR##_activeSpy.count(), COUNT); \ + bool active = true; \ + for (const QList<QVariant> &activeArgs : static_cast<QList<QList<QVariant> > >(VAR##_activeSpy)) { \ + QVERIFY(activeArgs.at(0).typeId() == QMetaType::Bool); \ + QVERIFY(activeArgs.at(0).toBool() == active); \ + active = !active; \ + } \ +} + class SignalEmitter : public QObject { Q_OBJECT @@ -6105,8 +6116,8 @@ thread.quit(); QTRY_VERIFY(thread.wait()); - TEST_ACTIVE_CHANGED(s1, 2); - TEST_ACTIVE_CHANGED(s2, 2); + TEST_ACTIVE_CHANGED_SPY_ONLY(s1, 2); + TEST_ACTIVE_CHANGED_SPY_ONLY(s2, 2); } class SignalTransitionMutatorThread : public QThread diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.8.1/tools/qscxmlc/doc/qscxmlc.qdoc new/qtscxml-everywhere-src-6.8.2/tools/qscxmlc/doc/qscxmlc.qdoc --- old/qtscxml-everywhere-src-6.8.1/tools/qscxmlc/doc/qscxmlc.qdoc 2024-11-21 04:34:03.000000000 +0100 +++ new/qtscxml-everywhere-src-6.8.2/tools/qscxmlc/doc/qscxmlc.qdoc 2025-01-24 10:11:49.000000000 +0100 @@ -17,7 +17,7 @@ The \c qscxmlc tool is invoked automatically if the project is linked against the \c scxml library in the project file, and the \c .scxml file to use is specified - using the special build directives \c STATECHARTS or qt6_add_statecharts. + using the special build directives \c STATECHARTS or \l{qt_add_statecharts}. When using cmake: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.8.1/tools/qscxmlc/generator.h new/qtscxml-everywhere-src-6.8.2/tools/qscxmlc/generator.h --- old/qtscxml-everywhere-src-6.8.1/tools/qscxmlc/generator.h 2024-11-21 04:34:03.000000000 +0100 +++ new/qtscxml-everywhere-src-6.8.2/tools/qscxmlc/generator.h 2025-01-24 10:11:49.000000000 +0100 @@ -27,7 +27,7 @@ QIODevice &outfile, // -- QtScxml bool requireCompleteTypes = false); void generateCode(); - qsizetype registeredStringsCount() { return strings.size(); }; + qsizetype registeredStringsCount() { return strings.size(); } // -- QtScxml void generateAccessorDefs(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.8.1/tools/qscxmlc/moc.cpp new/qtscxml-everywhere-src-6.8.2/tools/qscxmlc/moc.cpp --- old/qtscxml-everywhere-src-6.8.1/tools/qscxmlc/moc.cpp 2024-11-21 04:34:03.000000000 +0100 +++ new/qtscxml-everywhere-src-6.8.2/tools/qscxmlc/moc.cpp 2025-01-24 10:11:49.000000000 +0100 @@ -522,7 +522,7 @@ bool Moc::testForFunctionModifiers(FunctionDef *def) { - return test(EXPLICIT) || test(INLINE) || + return test(EXPLICIT) || test(INLINE) || test(CONSTEXPR) || (test(STATIC) && (def->isStatic = true)) || (test(VIRTUAL) && (def->isVirtual = true)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-6.8.1/tools/qscxmlc/moc_patches/generator.h.patch new/qtscxml-everywhere-src-6.8.2/tools/qscxmlc/moc_patches/generator.h.patch --- old/qtscxml-everywhere-src-6.8.1/tools/qscxmlc/moc_patches/generator.h.patch 2024-11-21 04:34:03.000000000 +0100 +++ new/qtscxml-everywhere-src-6.8.2/tools/qscxmlc/moc_patches/generator.h.patch 2025-01-24 10:11:49.000000000 +0100 @@ -29,7 +29,7 @@ + QIODevice &outfile, // -- QtScxml bool requireCompleteTypes = false); void generateCode(); - qsizetype registeredStringsCount() { return strings.size(); }; + qsizetype registeredStringsCount() { return strings.size(); } +// -- QtScxml + void generateAccessorDefs();
