Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kdstatemachineeditor for
openSUSE:Factory checked in at 2025-09-26 22:25:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdstatemachineeditor (Old)
and /work/SRC/openSUSE:Factory/.kdstatemachineeditor.new.11973 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdstatemachineeditor"
Fri Sep 26 22:25:06 2025 rev:13 rq:1307297 version:2.2.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/kdstatemachineeditor/kdstatemachineeditor.changes
2025-05-20 09:36:41.353684042 +0200
+++
/work/SRC/openSUSE:Factory/.kdstatemachineeditor.new.11973/kdstatemachineeditor.changes
2025-09-26 22:26:55.864103976 +0200
@@ -1,0 +2,9 @@
+Fri Sep 26 07:29:46 UTC 2025 - Christophe Marin <[email protected]>
+
+- Update to 2.2.0
+ * Bump embedded Graphviz to 13.1.0
+ * Remove Qt 5 support to simplify maintenance
+ * Fix build with Qt 6.10
+- Drop the Qt 5 flavor
+
+-------------------------------------------------------------------
Old:
----
_multibuild
kdstatemachineeditor-2.1.0.tar.gz
New:
----
kdstatemachineeditor-2.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdstatemachineeditor.spec ++++++
--- /var/tmp/diff_new_pack.mPHRYr/_old 2025-09-26 22:26:56.516131475 +0200
+++ /var/tmp/diff_new_pack.mPHRYr/_new 2025-09-26 22:26:56.520131644 +0200
@@ -1,7 +1,7 @@
#
# spec file for package kdstatemachineeditor
#
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,59 +15,37 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-%global flavor @BUILD_FLAVOR@%{nil}
-%if "%{flavor}" == "qt6"
-%define qt6 1
-%define pkg_suffix -qt6
-%define qt_suffix 6
-%define qt_min_version 6.1
-%else
-%define qt5 1
-%define qt_suffix 5
-%define qt_min_version 5.15
-%endif
+
+%define qt6_version 6.1
#
%global sover 2
-%define libnamecore libkdstatemachineeditor_core%{?qt6:%{pkg_suffix}-}%{sover}
-%define libnamedebuginterfaceclient
libkdstatemachineeditor_debuginterfaceclient%{?qt6:%{pkg_suffix}-}%{sover}
-%define libnamedebuginterfacesource
libkdstatemachineeditor_debuginterfacesource%{?qt6:%{pkg_suffix}}-static
-%define libnameview libkdstatemachineeditor_view%{?qt6:%{pkg_suffix}-}%{sover}
#
-Name: kdstatemachineeditor%{?pkg_suffix}
-Version: 2.1.0
+Name: kdstatemachineeditor
+Version: 2.2.0
Release: 0
Summary: A framework for creating Qt State Machine metacode using a GUI
# Legal: NOTE the EULA mentioned in LICENSE.txt only applies to "Licensed
Product" users.
License: LGPL-2.1-only
-Group: Development/Libraries/C and C++
URL: https://kdab.github.io/KDStateMachineEditor/
Source0:
https://github.com/KDAB/KDStateMachineEditor/releases/download/v%{version}/kdstatemachineeditor-%{version}.tar.gz
# PATCH-FIX-OPENSUSE -- work around build issue caused by graphviz packaging
decisions
Patch0: 0001-CMake-Find-gvplugin_dot_layout-on-openSUSE.patch
-BuildRequires: cmake >= 3.16.0
BuildRequires: doxygen
BuildRequires: graphviz-devel >= 2.30.1
BuildRequires: graphviz-gnome
-BuildRequires: cmake(Qt%{qt_suffix}Core) >= %{qt_min_version}
-BuildRequires: cmake(Qt%{qt_suffix}Gui) >= %{qt_min_version}
-BuildRequires: cmake(Qt%{qt_suffix}Quick) >= %{qt_min_version}
-BuildRequires: cmake(Qt%{qt_suffix}QuickWidgets) >= %{qt_min_version}
-BuildRequires: cmake(Qt%{qt_suffix}RemoteObjects) >= %{qt_min_version}
-BuildRequires: cmake(Qt%{qt_suffix}Scxml) >= %{qt_min_version}
-BuildRequires: cmake(Qt%{qt_suffix}Test) >= %{qt_min_version}
-BuildRequires: cmake(Qt%{qt_suffix}Widgets) >= %{qt_min_version}
-%if 0%{?qt5}
-BuildRequires: libQt5Gui-private-headers-devel >= %{qt_min_version}
-BuildRequires: libqt5-qtscxml-private-headers-devel >= %{qt_min_version}
-BuildRequires: cmake(Qt5XmlPatterns) >= %{qt_min_version}
-%endif
-%if 0%{?qt6}
-BuildRequires: qt6-gui-private-devel >= %{qt_min_version}
-BuildRequires: qt6-scxml-private-devel >= %{qt_min_version}
-BuildRequires: cmake(Qt6Core5Compat) >= %{qt_min_version}
-BuildRequires: cmake(Qt6QuickControls2) >= %{qt_min_version}
-BuildRequires: cmake(Qt6StateMachine) >= %{qt_min_version}
-%endif
+BuildRequires: qt6-gui-private-devel >= %{qt6_version}
+BuildRequires: qt6-scxml-private-devel >= %{qt6_version}
+BuildRequires: cmake(Qt6Core) >= %{qt6_version}
+BuildRequires: cmake(Qt6Core5Compat) >= %{qt6_version}
+BuildRequires: cmake(Qt6Gui) >= %{qt6_version}
+BuildRequires: cmake(Qt6Quick) >= %{qt6_version}
+BuildRequires: cmake(Qt6QuickControls2) >= %{qt6_version}
+BuildRequires: cmake(Qt6QuickWidgets) >= %{qt6_version}
+BuildRequires: cmake(Qt6RemoteObjects) >= %{qt6_version}
+BuildRequires: cmake(Qt6Scxml) >= %{qt6_version}
+BuildRequires: cmake(Qt6StateMachine) >= %{qt6_version}
+BuildRequires: cmake(Qt6Test) >= %{qt6_version}
+BuildRequires: cmake(Qt6Widgets) >= %{qt6_version}
Requires: graphviz-plugins-core
%description
@@ -76,31 +54,28 @@
interfaces and tools. Output from such applications is in metacode
or QML that can then be used in Qt or QtQuick projects.
-%package -n %{libnamecore}
+%package -n libkdstatemachineeditor_core-qt6-%{sover}
Summary: KDAB State Machine Editor core library
-Group: System/Libraries
-%description -n %{libnamecore}
+%description -n libkdstatemachineeditor_core-qt6-%{sover}
The KDAB State Machine Editor Library is a framework that can be used
to help develop State Machine Editing graphical user
interfaces and tools. Output from such applications is in metacode
or QML that can then be used in Qt or QtQuick projects.
-%package -n %{libnamedebuginterfaceclient}
+%package -n libkdstatemachineeditor_debuginterfaceclient-qt6-%{sover}
Summary: KDAB State Machine Editor core library
-Group: System/Libraries
-%description -n %{libnamedebuginterfaceclient}
+%description -n libkdstatemachineeditor_debuginterfaceclient-qt6-%{sover}
The KDAB State Machine Editor Library is a framework that can be used
to help develop State Machine Editing graphical user
interfaces and tools. Output from such applications is in metacode
or QML that can then be used in Qt or QtQuick projects.
-%package -n %{libnamedebuginterfacesource}
+%package -n libkdstatemachineeditor_debuginterfacesource-qt6-static
Summary: KDAB State Machine Editor core library
-Group: System/Libraries
-%description -n %{libnamedebuginterfacesource}
+%description -n libkdstatemachineeditor_debuginterfacesource-qt6-static
The KDAB State Machine Editor Library is a framework that can be used
to help develop State Machine Editing graphical user
interfaces and tools. Output from such applications is in metacode
@@ -110,11 +85,10 @@
process running on the target in order to get information about the
internal state machines.
-%package -n %{libnameview}
+%package -n libkdstatemachineeditor_view-qt6-%{sover}
Summary: KDAB State Machine Editor view library
-Group: System/Libraries
-%description -n %{libnameview}
+%description -n libkdstatemachineeditor_view-qt6-%{sover}
The KDAB State Machine Editor Library is a framework that can be used
to help develop State Machine Editing graphical user
interfaces and tools. Output from such applications is in metacode
@@ -122,13 +96,12 @@
%package devel
Summary: Introspection/Debugging Tool for Qt Applications
-Group: Development/Libraries/C and C++
-Requires: %{libnamecore} = %{version}
-Requires: %{libnamedebuginterfaceclient} = %{version}
-Requires: %{libnamedebuginterfacesource} = %{version}
-Requires: %{libnameview} = %{version}
-Provides: %{name} = %{version}
-Obsoletes: %{name} < %{version}
+Requires: libkdstatemachineeditor_core-qt6-%{sover} = %{version}
+Requires: libkdstatemachineeditor_debuginterfaceclient-qt6-%{sover} =
%{version}
+Requires: libkdstatemachineeditor_debuginterfacesource-qt6-static =
%{version}
+Requires: libkdstatemachineeditor_view-qt6-%{sover} = %{version}
+Provides: kdstatemachineeditor-qt6 = %{version}
+Obsoletes: kdstatemachineeditor-qt6 < %{version}
%description devel
The KDAB State Machine Editor Library is a framework that can be used
@@ -143,64 +116,40 @@
# libkdstatemachineeditor_debuginterfacesource is a static library
%global _lto_cflags %{?_lto_cflags} -ffat-lto-objects
-%if 0%{?qt5}
-%cmake \
- -DECM_MKSPECS_INSTALL_DIR:STRING=%{_libdir}/qt5/mkspecs/modules \
- -DKDSME_QT6:BOOL=FALSE \
- -DKDSME_INTERNAL_GRAPHVIZ:BOOL=FALSE
-
-%cmake_build
-%endif
-
-%if 0%{?qt6}
%cmake_qt6 \
- -DKDSME_QT6:BOOL=TRUE \
-DKDSME_INTERNAL_GRAPHVIZ:BOOL=FALSE
%qt6_build
-%endif
%install
-%if 0%{?qt5}
-%cmake_install
-%endif
-
-%if 0%{?qt6}
%qt6_install
-%endif
-%ldconfig_scriptlets -n %{libnamecore}
-%ldconfig_scriptlets -n %{libnamedebuginterfaceclient}
-%ldconfig_scriptlets -n %{libnameview}
+%ldconfig_scriptlets -n libkdstatemachineeditor_core-qt6-%{sover}
+%ldconfig_scriptlets -n
libkdstatemachineeditor_debuginterfaceclient-qt6-%{sover}
+%ldconfig_scriptlets -n libkdstatemachineeditor_view-qt6-%{sover}
-%files -n %{libnamecore}
+%files -n libkdstatemachineeditor_core-qt6-%{sover}
%license LICENSES/*
%doc CHANGES README.md
-%{_libdir}/libkdstatemachineeditor_core%{?pkg_suffix}.so.%{sover}
+%{_libdir}/libkdstatemachineeditor_core-qt6.so.%{sover}
-%files -n %{libnamedebuginterfaceclient}
+%files -n libkdstatemachineeditor_debuginterfaceclient-qt6-%{sover}
%license LICENSES/*
-%{_libdir}/libkdstatemachineeditor_debuginterfaceclient%{?pkg_suffix}.so.%{sover}
+%{_libdir}/libkdstatemachineeditor_debuginterfaceclient-qt6.so.%{sover}
-%files -n %{libnamedebuginterfacesource}
+%files -n libkdstatemachineeditor_debuginterfacesource-qt6-static
%license LICENSES/*
-%{_libdir}/libkdstatemachineeditor_debuginterfacesource%{?pkg_suffix}.a
+%{_libdir}/libkdstatemachineeditor_debuginterfacesource-qt6.a
-%files -n %{libnameview}
+%files -n libkdstatemachineeditor_view-qt6-%{sover}
%license LICENSES/*
-%{_libdir}/libkdstatemachineeditor_view%{?pkg_suffix}.so.%{sover}
+%{_libdir}/libkdstatemachineeditor_view-qt6.so.%{sover}
%files devel
%license LICENSES/*
-%{_includedir}/kdstatemachineeditor%{?pkg_suffix}/
-%{_libdir}/cmake/KDSME%{?pkg_suffix}/
-%{_libdir}/libkdstatemachineeditor_core%{?pkg_suffix}.so
-%{_libdir}/libkdstatemachineeditor_debuginterfaceclient%{?pkg_suffix}.so
-%{_libdir}/libkdstatemachineeditor_view%{?pkg_suffix}.so
-%if 0%{?qt5}
-%{_libdir}/qt5/mkspecs/modules/qt_KDSMECore.pri
-%{_libdir}/qt5/mkspecs/modules/qt_KDSMEDebugInterfaceClient.pri
-%{_libdir}/qt5/mkspecs/modules/qt_KDSMEDebugInterfaceSource.pri
-%{_libdir}/qt5/mkspecs/modules/qt_KDSMEView.pri
-%endif
+%{_includedir}/kdstatemachineeditor-qt6/
+%{_libdir}/cmake/KDSME-qt6/
+%{_libdir}/libkdstatemachineeditor_core-qt6.so
+%{_libdir}/libkdstatemachineeditor_debuginterfaceclient-qt6.so
+%{_libdir}/libkdstatemachineeditor_view-qt6.so
++++++ kdstatemachineeditor-2.1.0.tar.gz -> kdstatemachineeditor-2.2.0.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/KDStateMachineEditor-2.1.0/.github/workflows/build-external-graphviz.yml
new/KDStateMachineEditor-2.2.0/.github/workflows/build-external-graphviz.yml
---
old/KDStateMachineEditor-2.1.0/.github/workflows/build-external-graphviz.yml
2025-05-06 23:53:54.000000000 +0200
+++
new/KDStateMachineEditor-2.2.0/.github/workflows/build-external-graphviz.yml
2025-09-26 00:11:11.000000000 +0200
@@ -28,7 +28,7 @@
- Static
config:
- qt_version: 6.6.2
- qt_modules: qtscxml
+ qt_modules: qtscxml qtremoteobjects
steps:
- name: Install Dependencies on Linux
@@ -67,7 +67,6 @@
--warn-uninitialized -Werror=dev
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-DCMAKE_OSX_ARCHITECTURES="arm64"
- -DKDSME_QT6=ON
-DBUILD_TESTING=${{ matrix.build_type == 'Debug' }}
-DKDSME_EXAMPLES=ON
-DKDSME_DOCS=${{ matrix.build_type == 'Debug' && runner.os ==
'Linux' }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/KDStateMachineEditor-2.1.0/.github/workflows/build.yml
new/KDStateMachineEditor-2.2.0/.github/workflows/build.yml
--- old/KDStateMachineEditor-2.1.0/.github/workflows/build.yml 2025-05-06
23:53:54.000000000 +0200
+++ new/KDStateMachineEditor-2.2.0/.github/workflows/build.yml 2025-09-26
00:11:11.000000000 +0200
@@ -29,15 +29,12 @@
- Shared
- Static
config:
- - qt_version: 5.15.2
- qt_arch: win64_msvc2019_64
- macos_architectures: "x86_64"
- qt_version: 6.6.2
- qt_modules: qtscxml
+ qt_modules: qtscxml qtremoteobjects
qt_arch: win64_msvc2019_64
macos_architectures: "x86_64;arm64"
- - qt_version: 6.9.0 # Bump to latest freely
- qt_modules: qtscxml
+ - qt_version: 6.10.0 # Bump to latest freely
+ qt_modules: qtscxml qtremoteobjects
qt_arch: win64_msvc2022_64
macos_architectures: "x86_64;arm64"
steps:
@@ -99,7 +96,6 @@
--warn-uninitialized -Werror=dev
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-DCMAKE_OSX_ARCHITECTURES="${{ matrix.config.macos_architectures }}"
- -DKDSME_QT6=${{ startsWith(matrix.config.qt_version, '6.') }}
-DBUILD_TESTING=${{ matrix.build_type == 'Debug' }}
-DKDSME_EXAMPLES=ON
-DKDSME_DOCS=${{ matrix.build_type == 'Debug' && runner.os ==
'Linux' }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/KDStateMachineEditor-2.1.0/.github/workflows/submodule-bump.yml
new/KDStateMachineEditor-2.2.0/.github/workflows/submodule-bump.yml
--- old/KDStateMachineEditor-2.1.0/.github/workflows/submodule-bump.yml
2025-05-06 23:53:54.000000000 +0200
+++ new/KDStateMachineEditor-2.2.0/.github/workflows/submodule-bump.yml
2025-09-26 00:11:11.000000000 +0200
@@ -10,7 +10,7 @@
description: "Select an option"
options:
- "Only print current and available versions"
- - Graphviz
+ - graphviz
name: bump submodules
jobs:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/KDStateMachineEditor-2.1.0/.pre-commit-config.yaml
new/KDStateMachineEditor-2.2.0/.pre-commit-config.yaml
--- old/KDStateMachineEditor-2.1.0/.pre-commit-config.yaml 2025-05-06
23:53:54.000000000 +0200
+++ new/KDStateMachineEditor-2.2.0/.pre-commit-config.yaml 2025-09-26
00:11:11.000000000 +0200
@@ -6,7 +6,7 @@
exclude:
^(cmake/ECM/|cmake/KDAB/|examples/qscxmldebugger/trafficlight.*|src/view/quick/qopengl2pexvertexarray.*|src/view/widgets/codeeditor.*|docs/api/doxygen-awesome.css)
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
- rev: v5.0.0
+ rev: v6.0.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
@@ -16,7 +16,7 @@
args: [--allow-multiple-documents]
- id: check-json
- repo: https://github.com/pre-commit/mirrors-clang-format
- rev: v20.1.3
+ rev: v21.1.0
hooks:
- id: clang-format
- repo: https://github.com/codespell-project/codespell
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/KDStateMachineEditor-2.1.0/CHANGES
new/KDStateMachineEditor-2.2.0/CHANGES
--- old/KDStateMachineEditor-2.1.0/CHANGES 2025-05-06 23:53:54.000000000
+0200
+++ new/KDStateMachineEditor-2.2.0/CHANGES 2025-09-26 00:11:11.000000000
+0200
@@ -1,3 +1,9 @@
+Version 2.2.0:
+--------------
+ * Bump to Graphviz 13.1.0
+ * Remove Qt 5 support to simplify maintenance
+ * Fix build with Qt 6.10
+
Version 2.1.0:
--------------
* KDStateMachineEditor now looks for Qt6 by default, rather than Qt5. If your
Qt5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/KDStateMachineEditor-2.1.0/CMakeLists.txt
new/KDStateMachineEditor-2.2.0/CMakeLists.txt
--- old/KDStateMachineEditor-2.1.0/CMakeLists.txt 2025-05-06
23:53:54.000000000 +0200
+++ new/KDStateMachineEditor-2.2.0/CMakeLists.txt 2025-09-26
00:11:11.000000000 +0200
@@ -28,10 +28,6 @@
# Currently shared graphviz builds on Windows have link issues.
# Default=true
#
-# -DKDSME_QT6=[true|false]
-# Build against Qt6 rather than Qt5
-# Default=true
-#
# -DKDSME_DOCS=[true|false]
# Build the documentation. Documentation is never built when cross-compiling.
# Default=true
@@ -100,9 +96,6 @@
renamed_option(BUILD_EXAMPLES KDSME_EXAMPLES)
renamed_option(BUILD_TESTS BUILD_TESTING)
-option(KDSME_QT6 "Build against Qt 6" ON)
-renamed_option(BUILD_QT6 KDSME_QT6)
-
option(BUILD_SHARED_LIBS "Build shared libraries" ON)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
@@ -124,20 +117,13 @@
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release"
"MinSizeRel" "RelWithDebInfo")
endif()
-if(KDSME_QT6)
- set(QT_VERSION_MAJOR 6)
- set(QT_MIN_VERSION "6.1.0")
- find_package(
- Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Quick QuickControls2
QuickWidgets Test Widgets StateMachine
- )
- set(KDSME_LIBRARY_QTID "-qt6")
-else()
- set(QT_VERSION_MAJOR 5)
- set(QT_MIN_VERSION "5.15")
- find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Quick
QuickWidgets Test Widgets)
- set(KDSME_LIBRARY_QTID "")
- include(ECMGeneratePriFile)
-endif()
+set(QT_VERSION_MAJOR 6)
+set(QT_MIN_VERSION "6.1.0")
+find_package(
+ Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Quick QuickControls2
QuickWidgets Test Widgets StateMachine
+)
+set(KDSME_LIBRARY_QTID "-qt6")
+
include(KDQtInstallPaths) #to set QT_INSTALL_FOO variables
find_package(Qt${QT_VERSION_MAJOR}RemoteObjects ${QT_MIN_VERSION} CONFIG QUIET)
@@ -156,15 +142,10 @@
PURPOSE "Needed for the Qt SCXML adapter (adapter itself depends on Qt
RemoteObjects)"
)
-# QtXmlPatterns is removed since Qt6
-if(NOT KDSME_QT6)
- find_package(Qt5XmlPatterns ${QT_MIN_VERSION} CONFIG QUIET)
- set_package_properties(
- Qt5XmlPatterns PROPERTIES
- TYPE OPTIONAL
- DESCRIPTION "Qt5 XmlPatterns library"
- PURPOSE "Required with Qt5 for unit tests dealing with XML
input/output"
- )
+if(Qt6Gui_VERSION VERSION_GREATER_EQUAL "6.10.0")
+ set(QT_NO_PRIVATE_MODULE_WARNING ON)
+ find_package(Qt6GuiPrivate REQUIRED NO_MODULE)
+ find_package(Qt6ScxmlPrivate REQUIRED NO_MODULE)
endif()
include(CheckCCompilerFlag)
@@ -210,11 +191,9 @@
${CMAKE_INSTALL_LIBDIR}
CACHE STRING "Library install destination."
)
-if(KDSME_QT6)
- set(INCLUDE_INSTALL_ROOT
${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_PROJECT_NAME}${KDSME_LIBRARY_QTID})
-else()
- set(INCLUDE_INSTALL_ROOT ${CMAKE_INSTALL_INCLUDEDIR}/)
-endif()
+
+set(INCLUDE_INSTALL_ROOT
${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_PROJECT_NAME}${KDSME_LIBRARY_QTID})
+
set(INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_ROOT}/${CMAKE_PROJECT_NAME})
set(XDG_DATA_INSTALL_DIR ${CMAKE_INSTALL_DATAROOTDIR}/${CMAKE_PROJECT_NAME})
@@ -310,13 +289,6 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wextra
-Woverloaded-virtual -Winit-self")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wmissing-include-dirs -Wunused
-Wno-div-by-zero -Wundef")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wpointer-arith -Wmissing-noreturn
-Werror=return-type -Wswitch")
- if(NOT KDSME_QT6)
- if(HAVE_GXX_GNUXX11) # QNX needs gnu++0x rather than c++0x for
compiling QML V4 private headers
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
- elseif(HAVE_GXX_CXX11)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
- endif()
- endif()
if(MINGW)
# mingw will error out on the crazy casts in probe.cpp without this
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
@@ -339,7 +311,7 @@
-DQT_USE_QSTRINGBUILDER
-DQT_NO_SIGNALS_SLOTS_KEYWORDS
-DQT_USE_FAST_OPERATOR_PLUS
- -DQT_DISABLE_DEPRECATED_BEFORE=0x050F00
+ -DQT_DISABLE_DEPRECATED_BEFORE=0x060900
)
if(MSVC)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/KDStateMachineEditor-2.1.0/CMakePresets.json
new/KDStateMachineEditor-2.2.0/CMakePresets.json
--- old/KDStateMachineEditor-2.1.0/CMakePresets.json 2025-05-06
23:53:54.000000000 +0200
+++ new/KDStateMachineEditor-2.2.0/CMakePresets.json 2025-09-26
00:11:11.000000000 +0200
@@ -36,32 +36,11 @@
}
},
{
- "name": "dev5-external-graphviz",
- "description": "Qt5 dev build with external graphviz",
- "inherits": "dev-base",
- "binaryDir": "${sourceDir}/build-dev5-external-graphviz",
- "cacheVariables": {
- "KDSME_QT6": "OFF",
- "KDSME_INTERNAL_GRAPHVIZ": "OFF"
- }
- },
- {
- "name": "dev5",
- "description": "Qt5 dev build",
- "inherits": "dev-base",
- "binaryDir": "${sourceDir}/build-dev5",
- "cacheVariables": {
- "KDSME_QT6": "OFF",
- "KDSME_INTERNAL_GRAPHVIZ": "ON"
- }
- },
- {
"name": "dev6-external-graphviz",
"description": "Qt6 dev build with external graphviz",
"inherits": "dev-base",
"binaryDir": "${sourceDir}/build-dev6-external-graphviz",
"cacheVariables": {
- "KDSME_QT6": "ON",
"KDSME_INTERNAL_GRAPHVIZ": "OFF"
}
},
@@ -71,7 +50,6 @@
"inherits": "dev-base",
"binaryDir": "${sourceDir}/build-dev6",
"cacheVariables": {
- "KDSME_QT6": "ON",
"KDSME_INTERNAL_GRAPHVIZ": "ON"
}
},
@@ -82,37 +60,15 @@
"hidden": true,
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release",
- "KDSME_QT6": "OFF",
"BUILD_TESTING": "OFF"
}
},
{
- "name": "rel5-external-graphviz",
- "description": "Qt5 release build with external graphviz",
- "inherits": "rel-base",
- "binaryDir": "${sourceDir}/build-rel5-external-graphviz",
- "cacheVariables": {
- "KDSME_QT6": "OFF",
- "KDSME_INTERNAL_GRAPHVIZ": "OFF"
- }
- },
- {
- "name": "rel5",
- "description": "Qt5 release build",
- "inherits": "rel-base",
- "binaryDir": "${sourceDir}/build-rel5",
- "cacheVariables": {
- "KDSME_QT6": "OFF",
- "KDSME_INTERNAL_GRAPHVIZ": "ON"
- }
- },
- {
"name": "rel6-external-graphviz",
"description": "Qt6 release build with external graphviz",
"inherits": "rel-base",
"binaryDir": "${sourceDir}/build-rel6-external-graphviz",
"cacheVariables": {
- "KDSME_QT6": "ON",
"KDSME_INTERNAL_GRAPHVIZ": "OFF"
}
},
@@ -122,7 +78,6 @@
"inherits": "rel-base",
"binaryDir": "${sourceDir}/build-rel6",
"cacheVariables": {
- "KDSME_QT6": "ON",
"KDSME_INTERNAL_GRAPHVIZ": "ON"
}
},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/KDStateMachineEditor-2.1.0/cmake/FindGraphviz.cmake
new/KDStateMachineEditor-2.2.0/cmake/FindGraphviz.cmake
--- old/KDStateMachineEditor-2.1.0/cmake/FindGraphviz.cmake 2025-05-06
23:53:54.000000000 +0200
+++ new/KDStateMachineEditor-2.2.0/cmake/FindGraphviz.cmake 2025-09-26
00:11:11.000000000 +0200
@@ -198,7 +198,7 @@
message(FATAL_ERROR "Unable to compile or run the graphviz
version detection program.")
endif()
endif()
- elseif()
+ else()
find_program(DOT_TOOL dot PATHS ${_GRAPHVIZ_ROOT}/bin)
execute_process(
COMMAND ${DOT_TOOL} -V
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/KDStateMachineEditor-2.1.0/examples/qscxmldebugger/CMakeLists.txt
new/KDStateMachineEditor-2.2.0/examples/qscxmldebugger/CMakeLists.txt
--- old/KDStateMachineEditor-2.1.0/examples/qscxmldebugger/CMakeLists.txt
2025-05-06 23:53:54.000000000 +0200
+++ new/KDStateMachineEditor-2.2.0/examples/qscxmldebugger/CMakeLists.txt
2025-09-26 00:11:11.000000000 +0200
@@ -13,21 +13,11 @@
#
add_executable(qscxmldebugger trafficlight.cpp main.cpp
trafficlight-widgets-static.qrc)
+
# Copy the .rep file to your project
-if(NOT KDSME_QT6)
- qt_generate_repc(REPC_SRCS ../../src/debuginterface/debuginterface.rep
REPLICA)
+qt_add_repc_replicas(qscxmldebugger
../../src/debuginterface/debuginterface.rep)
+qt_add_statecharts(qscxmldebugger statemachine.scxml)
- qt_add_statecharts(STATECHART_SRCS statemachine.scxml)
- # Work-around QTBUG-84387
- # Needed in Qt5, otherwise we'll run into duplicate symbol issues like
this:
- # ld: error: duplicate symbol:
TrafficLightStateMachine::qt_metacall(QMetaObject::Call, int, void**)
- set_source_files_properties(${STATECHART_SRCS} PROPERTIES GENERATED TRUE
SKIP_AUTOGEN ON)
- target_sources(qscxmldebugger PRIVATE ${REPC_SRCS} ${STATECHART_SRCS})
-endif()
-if(KDSME_QT6)
- qt_add_repc_replicas(qscxmldebugger
../../src/debuginterface/debuginterface.rep)
- qt_add_statecharts(qscxmldebugger statemachine.scxml)
-endif()
target_link_libraries(
qscxmldebugger
KDSME::Core
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/KDStateMachineEditor-2.1.0/examples/qsmdebugger/CMakeLists.txt
new/KDStateMachineEditor-2.2.0/examples/qsmdebugger/CMakeLists.txt
--- old/KDStateMachineEditor-2.1.0/examples/qsmdebugger/CMakeLists.txt
2025-05-06 23:53:54.000000000 +0200
+++ new/KDStateMachineEditor-2.2.0/examples/qsmdebugger/CMakeLists.txt
2025-09-26 00:11:11.000000000 +0200
@@ -13,15 +13,12 @@
#
set(SRCS trafficlight.cpp main.cpp)
-# Copy the .rep file to your project
-if(NOT KDSME_QT6)
- qt5_generate_repc(SRCS ../../src/debuginterface/debuginterface.rep REPLICA)
-endif()
+
add_executable(qsmdebugger ${SRCS})
-if(KDSME_QT6)
- qt6_add_repc_replicas(qsmdebugger
../../src/debuginterface/debuginterface.rep)
- target_link_libraries(qsmdebugger Qt6::StateMachine)
-endif()
+
+qt6_add_repc_replicas(qsmdebugger ../../src/debuginterface/debuginterface.rep)
+target_link_libraries(qsmdebugger Qt6::StateMachine)
+
target_link_libraries(
qsmdebugger
KDSME::Core
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/KDStateMachineEditor-2.1.0/src/core/CMakeLists.txt
new/KDStateMachineEditor-2.2.0/src/core/CMakeLists.txt
--- old/KDStateMachineEditor-2.1.0/src/core/CMakeLists.txt 2025-05-06
23:53:54.000000000 +0200
+++ new/KDStateMachineEditor-2.2.0/src/core/CMakeLists.txt 2025-09-26
00:11:11.000000000 +0200
@@ -82,13 +82,10 @@
target_link_libraries(
kdstatemachineeditor_core
PRIVATE Qt${QT_VERSION_MAJOR}::Quick # TODO: Get rid off this
+ Qt6::StateMachine
PUBLIC Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui
)
-if(KDSME_QT6)
- target_link_libraries(kdstatemachineeditor_core PRIVATE Qt6::StateMachine)
-endif()
-
if(NOT KDSME_INTERNAL_GRAPHVIZ)
target_include_directories(kdstatemachineeditor_core PRIVATE
${GRAPHVIZ_INCLUDE_DIR})
endif()
@@ -189,22 +186,6 @@
DESTINATION ${INCLUDE_INSTALL_DIR}/core
)
-if(NOT KDSME_QT6)
- ecm_generate_pri_file(
- BASE_NAME
- KDSMECore
- LIB_NAME
- kdstatemachineeditor_core
- DEPS
- "core gui"
- FILENAME_VAR
- PRI_FILENAME
- INCLUDE_INSTALL_DIR
- ${INCLUDE_INSTALL_DIR}/core
- )
- install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
-endif()
-
if(BUILD_TESTING)
add_subdirectory(tests)
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/KDStateMachineEditor-2.1.0/src/core/tests/CMakeLists.txt
new/KDStateMachineEditor-2.2.0/src/core/tests/CMakeLists.txt
--- old/KDStateMachineEditor-2.1.0/src/core/tests/CMakeLists.txt
2025-05-06 23:53:54.000000000 +0200
+++ new/KDStateMachineEditor-2.2.0/src/core/tests/CMakeLists.txt
2025-09-26 00:11:11.000000000 +0200
@@ -14,12 +14,6 @@
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-test.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/config-test.h)
-# QtXmlPatterns fails badly on OSX -- see
https://bugreports.qt-project.org/browse/QTBUG-40818
-if(TARGET Qt5::XmlPatterns_FOUND AND NOT APPLE)
- add_definitions(-DUSE_QT_XMLPATTERNS_LIB)
- list(APPEND KDSME_TESTHELPER_EXTRA_LIBS Qt5::XmlPatterns)
-endif()
-
add_library(kdsme_testhelper STATIC parsehelper.cpp util.cpp)
target_link_libraries(kdsme_testhelper Qt::Test kdstatemachineeditor_core)
@@ -35,9 +29,6 @@
if(TARGET Qt::RemoteObjects)
set(SRCS test_qsmintegration.cpp)
- if(NOT KDSME_QT6)
- qt_generate_repc(SRCS ../../debuginterface/debuginterface.rep REPLICA)
- endif()
ecm_add_test(
${SRCS}
TEST_NAME
@@ -45,14 +36,12 @@
LINK_LIBRARIES
Qt::RemoteObjects
Qt::Test
+ Qt::StateMachine
kdstatemachineeditor_debuginterfaceclient
kdstatemachineeditor_debuginterfacesource
kdsme_testhelper
)
- if(KDSME_QT6)
- target_link_libraries(test_qsmintegration Qt6::StateMachine)
- qt_add_repc_replicas(test_qsmintegration
../../debuginterface/debuginterface.rep)
- endif()
+ qt_add_repc_replicas(test_qsmintegration
../../debuginterface/debuginterface.rep)
endif()
ecm_add_test(test_scxmlimport.cpp LINK_LIBRARIES kdsme_testhelper)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/KDStateMachineEditor-2.1.0/src/core/tests/test_scxmlexport.cpp
new/KDStateMachineEditor-2.2.0/src/core/tests/test_scxmlexport.cpp
--- old/KDStateMachineEditor-2.1.0/src/core/tests/test_scxmlexport.cpp
2025-05-06 23:53:54.000000000 +0200
+++ new/KDStateMachineEditor-2.2.0/src/core/tests/test_scxmlexport.cpp
2025-09-26 00:11:11.000000000 +0200
@@ -22,11 +22,6 @@
#include <QDebug>
#include <QTest>
-#ifdef USE_QT_XMLPATTERNS_LIB
-#include <QBuffer>
-#include <QXmlQuery>
-#endif
-
#define QVERIFY_RETURN(statement, retval) \
do { \
if (!QTest::qVerify((statement), #statement, "", __FILE__, __LINE__)) \
@@ -35,27 +30,6 @@
using namespace KDSME;
-namespace {
-
-#ifdef USE_QT_XMLPATTERNS_LIB
-QStringList query(QByteArray xml, const QString &sourceCode)
-{
- static const QString preamble =
- "declare default element namespace
\"http://www.w3.org/2005/07/scxml\";";;
-
- QBuffer buffer(&xml);
- buffer.open(QIODevice::ReadOnly);
- QXmlQuery query;
- query.bindVariable("input", &buffer);
- query.setQuery(preamble + sourceCode);
- QStringList result;
- query.evaluateTo(&result);
- return result;
-}
-#endif
-
-}
-
class ScxmlExportTest : public QObject
{
Q_OBJECT
@@ -107,18 +81,6 @@
const bool success = exporter.exportMachine(&root);
QVERIFY(success);
QVERIFY(!output.isEmpty());
-
-#ifdef USE_QT_XMLPATTERNS_LIB
- QStringList stateMachineIds = query(output,
"doc($input)/scxml/@name/string()");
- QCOMPARE(stateMachineIds, QStringList() << "root");
- QStringList stateIds = query(output,
"doc($input)/scxml/state/@id/string()");
- QCOMPARE(stateIds, QStringList() << "s1"
- << "s2");
- QStringList initialStateIds = query(output,
"doc($input)/scxml/@initial/string()");
- QCOMPARE(initialStateIds, QStringList() << "s1");
- QStringList transitions = query(output,
"doc($input)/scxml/state[@id='s1']/transition/@event/string()");
- QCOMPARE(transitions, QStringList() << "e1");
-#endif
}
QTEST_MAIN(ScxmlExportTest)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/KDStateMachineEditor-2.1.0/src/debuginterface/debuginterfaceclient/CMakeLists.txt
new/KDStateMachineEditor-2.2.0/src/debuginterface/debuginterfaceclient/CMakeLists.txt
---
old/KDStateMachineEditor-2.1.0/src/debuginterface/debuginterfaceclient/CMakeLists.txt
2025-05-06 23:53:54.000000000 +0200
+++
new/KDStateMachineEditor-2.2.0/src/debuginterface/debuginterfaceclient/CMakeLists.txt
2025-09-26 00:11:11.000000000 +0200
@@ -13,15 +13,10 @@
#
set(DEBUGINTERFACECLIENT_SRCS debuginterfaceclient.cpp)
-if(NOT KDSME_QT6)
- qt5_generate_repc(DEBUGINTERFACECLIENT_SRCS ../debuginterface.rep REPLICA)
-endif()
add_library(kdstatemachineeditor_debuginterfaceclient
${DEBUGINTERFACECLIENT_SRCS})
-if(KDSME_QT6)
- qt6_add_repc_replicas(kdstatemachineeditor_debuginterfaceclient
../debuginterface.rep)
-endif()
+qt6_add_repc_replicas(kdstatemachineeditor_debuginterfaceclient
../debuginterface.rep)
add_library(KDSME::DebugInterfaceClient ALIAS
kdstatemachineeditor_debuginterfaceclient)
target_link_libraries(
@@ -58,21 +53,7 @@
kdstatemachineeditor_debuginterfaceclient PUBLIC
"$<BUILD_INTERFACE:${build_iface_dirs}>"
$<INSTALL_INTERFACE:${INCLUDE_INSTALL_ROOT}>
)
-if(NOT KDSME_QT6)
- ecm_generate_pri_file(
- BASE_NAME
- KDSMEDebugInterfaceClient
- LIB_NAME
- kdstatemachineeditor_debuginterfaceclient
- DEPS
- ""
- FILENAME_VAR
- PRI_FILENAME
- INCLUDE_INSTALL_DIR
- ${INCLUDE_INSTALL_DIR}/debuginterfaceclient
- )
- install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
-endif()
+
set_target_properties(
kdstatemachineeditor_debuginterfaceclient
PROPERTIES OUTPUT_NAME
"kdstatemachineeditor_debuginterfaceclient${KDSME_LIBRARY_QTID}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/KDStateMachineEditor-2.1.0/src/debuginterface/debuginterfacesource/CMakeLists.txt
new/KDStateMachineEditor-2.2.0/src/debuginterface/debuginterfacesource/CMakeLists.txt
---
old/KDStateMachineEditor-2.1.0/src/debuginterface/debuginterfacesource/CMakeLists.txt
2025-05-06 23:53:54.000000000 +0200
+++
new/KDStateMachineEditor-2.2.0/src/debuginterface/debuginterfacesource/CMakeLists.txt
2025-09-26 00:11:11.000000000 +0200
@@ -18,16 +18,10 @@
list(APPEND QSMDEBUGINTERFACESOURCE_SRCS qscxmldebuginterfacesource.cpp)
endif()
-if(NOT KDSME_QT6)
- qt5_generate_repc(QSMDEBUGINTERFACESOURCE_SRCS ../debuginterface.rep
SOURCE)
-endif()
-
add_library(kdstatemachineeditor_debuginterfacesource STATIC
${QSMDEBUGINTERFACESOURCE_SRCS})
-if(KDSME_QT6)
- qt6_add_repc_sources(kdstatemachineeditor_debuginterfacesource
../debuginterface.rep)
- target_link_libraries(kdstatemachineeditor_debuginterfacesource
LINK_PRIVATE Qt6::StateMachine)
-endif()
+qt6_add_repc_sources(kdstatemachineeditor_debuginterfacesource
../debuginterface.rep)
+target_link_libraries(kdstatemachineeditor_debuginterfacesource LINK_PRIVATE
Qt6::StateMachine)
add_library(KDSME::DebugInterfaceSource ALIAS
kdstatemachineeditor_debuginterfacesource)
target_link_libraries(
@@ -71,21 +65,7 @@
PUBLIC $<INSTALL_INTERFACE:${INCLUDE_INSTALL_ROOT}>
PRIVATE ../
)
-if(NOT KDSME_QT6)
- ecm_generate_pri_file(
- BASE_NAME
- KDSMEDebugInterfaceSource
- LIB_NAME
- kdstatemachineeditor_debuginterfacesource
- DEPS
- ""
- FILENAME_VAR
- PRI_FILENAME
- INCLUDE_INSTALL_DIR
- ${INCLUDE_INSTALL_DIR}/debuginterfacesource
- )
- install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
-endif()
+
set_target_properties(
kdstatemachineeditor_debuginterfacesource
PROPERTIES OUTPUT_NAME
"kdstatemachineeditor_debuginterfacesource${KDSME_LIBRARY_QTID}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/KDStateMachineEditor-2.1.0/src/debuginterface/debuginterfacesource/qscxmldebuginterfacesource.cpp
new/KDStateMachineEditor-2.2.0/src/debuginterface/debuginterfacesource/qscxmldebuginterfacesource.cpp
---
old/KDStateMachineEditor-2.1.0/src/debuginterface/debuginterfacesource/qscxmldebuginterfacesource.cpp
2025-05-06 23:53:54.000000000 +0200
+++
new/KDStateMachineEditor-2.2.0/src/debuginterface/debuginterfacesource/qscxmldebuginterfacesource.cpp
2025-09-26 00:11:11.000000000 +0200
@@ -251,7 +251,7 @@
StateMachineConfiguration config;
config.reserve(newConfig.size());
- for (auto state : qAsConst(newConfig)) {
+ for (auto state : std::as_const(newConfig)) {
config << makeStateId(state);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/KDStateMachineEditor-2.1.0/src/debuginterface/debuginterfacesource/qsmdebuginterfacesource.cpp
new/KDStateMachineEditor-2.2.0/src/debuginterface/debuginterfacesource/qsmdebuginterfacesource.cpp
---
old/KDStateMachineEditor-2.1.0/src/debuginterface/debuginterfacesource/qsmdebuginterfacesource.cpp
2025-05-06 23:53:54.000000000 +0200
+++
new/KDStateMachineEditor-2.2.0/src/debuginterface/debuginterfacesource/qsmdebuginterfacesource.cpp
2025-09-26 00:11:11.000000000 +0200
@@ -222,7 +222,7 @@
StateMachineConfiguration config;
config.reserve(newConfig.size());
- for (QAbstractState *state : qAsConst(newConfig)) {
+ for (QAbstractState *state : std::as_const(newConfig)) {
config << makeStateId(state);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/KDStateMachineEditor-2.1.0/src/view/CMakeLists.txt
new/KDStateMachineEditor-2.2.0/src/view/CMakeLists.txt
--- old/KDStateMachineEditor-2.1.0/src/view/CMakeLists.txt 2025-05-06
23:53:54.000000000 +0200
+++ new/KDStateMachineEditor-2.2.0/src/view/CMakeLists.txt 2025-09-26
00:11:11.000000000 +0200
@@ -118,22 +118,6 @@
DESTINATION ${INCLUDE_INSTALL_DIR}/view
)
-if(NOT KDSME_QT6)
- ecm_generate_pri_file(
- BASE_NAME
- KDSMEView
- LIB_NAME
- kdstatemachineeditor_view
- DEPS
- "core gui qml quickwidgets widgets KDSMECore"
- FILENAME_VAR
- PRI_FILENAME
- INCLUDE_INSTALL_DIR
- ${INCLUDE_INSTALL_DIR}/view
- )
- install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
-endif()
-
if(BUILD_TESTING)
add_subdirectory(tests)
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/KDStateMachineEditor-2.1.0/src/view/quick/quickmaskedmousearea.cpp
new/KDStateMachineEditor-2.2.0/src/view/quick/quickmaskedmousearea.cpp
--- old/KDStateMachineEditor-2.1.0/src/view/quick/quickmaskedmousearea.cpp
2025-05-06 23:53:54.000000000 +0200
+++ new/KDStateMachineEditor-2.2.0/src/view/quick/quickmaskedmousearea.cpp
2025-09-26 00:11:11.000000000 +0200
@@ -148,13 +148,8 @@
const int threshold = qApp->styleHints()->startDragDistance();
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
const int eventX = static_cast<int>(event->position().x());
const int eventY = static_cast<int>(event->position().y());
-#else
- const int eventX = event->x();
- const int eventY = event->y();
-#endif
const bool isClick = (threshold >= qAbs(eventX - m_pressPoint.x()) &&
threshold >= qAbs(eventY - m_pressPoint.y()));
if (isClick)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/KDStateMachineEditor-2.1.0/src/view/quick/quicksceneitem.cpp
new/KDStateMachineEditor-2.2.0/src/view/quick/quicksceneitem.cpp
--- old/KDStateMachineEditor-2.1.0/src/view/quick/quicksceneitem.cpp
2025-05-06 23:53:54.000000000 +0200
+++ new/KDStateMachineEditor-2.2.0/src/view/quick/quicksceneitem.cpp
2025-09-26 00:11:11.000000000 +0200
@@ -135,11 +135,7 @@
// select other items in the scene until we reset the QQuickWindow's
state
AbstractSceneContextMenuEvent contextMenuEvent(
QContextMenuEvent::Mouse,
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
event->pos(), event->globalPosition().toPoint(),
event->modifiers(),
-#else
- event->pos(), event->globalPos(), event->modifiers(),
-#endif
element());
QCoreApplication::sendEvent(scene(), &contextMenuEvent);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/KDStateMachineEditor-2.1.0/src/view/widgets/propertyeditor.cpp
new/KDStateMachineEditor-2.2.0/src/view/widgets/propertyeditor.cpp
--- old/KDStateMachineEditor-2.1.0/src/view/widgets/propertyeditor.cpp
2025-05-06 23:53:54.000000000 +0200
+++ new/KDStateMachineEditor-2.2.0/src/view/widgets/propertyeditor.cpp
2025-09-26 00:11:11.000000000 +0200
@@ -338,11 +338,7 @@
QVariant newValue;
auto *comboBox = qobject_cast<QComboBox *>(object);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
if (comboBox && currentValue.typeId() != QMetaType::QString) { // the user
property on QComboBox is currentString, not always what we want
-#else
- if (comboBox && currentValue.type() != QVariant::String) { // the user
property on QComboBox is currentString, not always what we want
-#endif
newValue = comboBox->currentIndex();
} else {
newValue = object->metaObject()->userProperty().read(object);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/KDStateMachineEditor-2.1.0/version.txt
new/KDStateMachineEditor-2.2.0/version.txt
--- old/KDStateMachineEditor-2.1.0/version.txt 2025-05-06 23:53:54.000000000
+0200
+++ new/KDStateMachineEditor-2.2.0/version.txt 2025-09-26 00:11:11.000000000
+0200
@@ -1 +1 @@
-2.1.0
+2.2.0
