Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-opcua for openSUSE:Factory checked in at 2024-03-28 13:54:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-opcua (Old) and /work/SRC/openSUSE:Factory/.qt6-opcua.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-opcua" Thu Mar 28 13:54:23 2024 rev:26 rq:1162385 version:6.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-opcua/qt6-opcua.changes 2024-02-18 20:24:23.280648927 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-opcua.new.1905/qt6-opcua.changes 2024-03-28 14:22:02.786555568 +0100 @@ -1,0 +2,6 @@ +Tue Mar 26 14:26:11 UTC 2024 - Christophe Marin <[email protected]> + +- Update to 6.6.3: + * https://www.qt.io/blog/qt-6.6.3-released + +------------------------------------------------------------------- Old: ---- qtopcua-everywhere-src-6.6.2.tar.xz New: ---- qtopcua-everywhere-src-6.6.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-opcua.spec ++++++ --- /var/tmp/diff_new_pack.c5pm04/_old 2024-03-28 14:22:11.482875478 +0100 +++ /var/tmp/diff_new_pack.c5pm04/_new 2024-03-28 14:22:11.482875478 +0100 @@ -1,7 +1,7 @@ # # spec file for package qt6-opcua # -# 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,7 +16,7 @@ # -%define real_version 6.6.2 +%define real_version 6.6.3 %define short_version 6.6 %define tar_name qtopcua-everywhere-src %define tar_suffix %{nil} @@ -27,12 +27,12 @@ %endif # Name: qt6-opcua%{?pkg_suffix} -Version: 6.6.2 +Version: 6.6.3 Release: 0 Summary: Qt wrapper for existing OPC UA stacks # src/plugins/opcua is GPL-3.0-or-later, rest is dual licensed # only exception is the open62541 folder which is MPL-2.0 -License: GPL-3.0-or-later AND (LGPL-3.0-only OR GPL-2.0-or-later) +License: (GPL-2.0-or-later OR LGPL-3.0-only) AND GPL-3.0-or-later URL: https://www.qt.io Source: %{tar_name}-%{real_version}%{tar_suffix}.tar.xz Source99: qt6-opcua-rpmlintrc ++++++ _service ++++++ --- /var/tmp/diff_new_pack.c5pm04/_old 2024-03-28 14:22:11.518876803 +0100 +++ /var/tmp/diff_new_pack.c5pm04/_new 2024-03-28 14:22:11.522876950 +0100 @@ -1,9 +1,9 @@ <services> <service name="tar_scm" mode="disabled"> <param name="changesgenerate">disable</param> - <param name="version">6.6.2</param> + <param name="version">6.6.3</param> <param name="url">git://code.qt.io/qt/qtopcua.git</param> - <param name="revision">v6.6.2</param> + <param name="revision">v6.6.3</param> <param name="scm">git</param> <param name="filename">qtopcua-everywhere-src</param> </service> ++++++ qtopcua-everywhere-src-6.6.2.tar.xz -> qtopcua-everywhere-src-6.6.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtopcua-everywhere-src-6.6.2/.cmake.conf new/qtopcua-everywhere-src-6.6.3/.cmake.conf --- old/qtopcua-everywhere-src-6.6.2/.cmake.conf 2024-02-09 23:03:37.000000000 +0100 +++ new/qtopcua-everywhere-src-6.6.3/.cmake.conf 2024-03-19 00:53:28.000000000 +0100 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.6.2") +set(QT_REPO_MODULE_VERSION "6.6.3") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_LEAN_HEADERS=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtopcua-everywhere-src-6.6.2/dependencies.yaml new/qtopcua-everywhere-src-6.6.3/dependencies.yaml --- old/qtopcua-everywhere-src-6.6.2/dependencies.yaml 2024-02-09 23:03:37.000000000 +0100 +++ new/qtopcua-everywhere-src-6.6.3/dependencies.yaml 2024-03-19 00:53:28.000000000 +0100 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: dec1863c7dc63e5788b0c6c061d36e856a6ae2b2 + ref: afdec885058c92e24604f398a926297222da06f3 required: true ../qtdeclarative: - ref: b3d82373ac90e54ad4cbab0c16709a19a9441beb + ref: ab5521fd1a637739c7e91def84caa84426055aff required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtopcua-everywhere-src-6.6.2/src/3rdparty/open62541/qt_attribution.json new/qtopcua-everywhere-src-6.6.3/src/3rdparty/open62541/qt_attribution.json --- old/qtopcua-everywhere-src-6.6.2/src/3rdparty/open62541/qt_attribution.json 2024-02-09 23:03:37.000000000 +0100 +++ new/qtopcua-everywhere-src-6.6.3/src/3rdparty/open62541/qt_attribution.json 2024-03-19 00:53:28.000000000 +0100 @@ -6,7 +6,7 @@ "Description": "Open62541 is an open source implementation of the OPC UA protocol.", "Homepage": "https://open62541.org/";, "Version": "1.3.6", - "License": "Mozilla Public License 2.0 and Creative Commons Zero v1.0 Universal and Creative Commons Attribution Non Commercial Share Alike 4.0 International and BSD 3-Clause \"New\" or \"Revised\" License and Apache License 2.0 and MIT License", + "License": "Mozilla Public License 2.0 and Creative Commons Zero v1.0 Universal and Creative Commons Attribution Share Alike 4.0 International and BSD 3-Clause \"New\" or \"Revised\" License and Apache License 2.0 and MIT License", "LicenseId": "MPL-2.0 AND CC0-1.0 AND CC-BY-SA-4.0 AND BSD-3-Clause AND Apache-2.0 AND MIT", "LicenseFiles": [ "mpl-2.0.815ca599c9df.txt", "LICENSE-CC0", "CC-BY-SA-4.0", "BSD-3-CLAUSE", "LICENSE-2.0.txt", "MIT" ], "CopyrightFile": "AUTHORS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/opcuaattributecache_p.h new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/opcuaattributecache_p.h --- old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/opcuaattributecache_p.h 2024-02-09 23:03:37.000000000 +0100 +++ new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/opcuaattributecache_p.h 2024-03-19 00:53:28.000000000 +0100 @@ -1,7 +1,8 @@ // Copyright (C) 2021 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 -#pragma once +#ifndef QOPCUA_OPCUAATTRIBUTECACHE_P_H +#define QOPCUA_OPCUAATTRIBUTECACHE_P_H #include "qopcuatype.h" #include <QtCore/qobject.h> @@ -41,3 +42,5 @@ }; QT_END_NAMESPACE + +#endif // QOPCUA_OPCUAATTRIBUTECACHE_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/opcuaattributevalue_p.h new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/opcuaattributevalue_p.h --- old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/opcuaattributevalue_p.h 2024-02-09 23:03:37.000000000 +0100 +++ new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/opcuaattributevalue_p.h 2024-03-19 00:53:28.000000000 +0100 @@ -1,7 +1,8 @@ // Copyright (C) 2021 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 -#pragma once +#ifndef QOPCUA_OPCUAATTRIBUTEVALUE_P_H +#define QOPCUA_OPCUAATTRIBUTEVALUE_P_H #include <QObject> #include <QVariant> @@ -39,3 +40,5 @@ }; QT_END_NAMESPACE + +#endif // QOPCUA_OPCUAATTRIBUTEVALUE_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/opcuaconnection_p.h new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/opcuaconnection_p.h --- old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/opcuaconnection_p.h 2024-02-09 23:03:37.000000000 +0100 +++ new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/opcuaconnection_p.h 2024-03-19 00:53:28.000000000 +0100 @@ -1,7 +1,8 @@ // Copyright (C) 2018 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 -#pragma once +#ifndef QOPCUA_OPCUACONNECTION_P_H +#define QOPCUA_OPCUACONNECTION_P_H #include <private/opcuareaditem_p.h> #include <private/opcuaserverdiscovery_p.h> @@ -106,3 +107,5 @@ }; QT_END_NAMESPACE + +#endif // QOPCUA_OPCUACONNECTION_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/opcuamethodargument_p.h new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/opcuamethodargument_p.h --- old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/opcuamethodargument_p.h 2024-02-09 23:03:37.000000000 +0100 +++ new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/opcuamethodargument_p.h 2024-03-19 00:53:28.000000000 +0100 @@ -1,7 +1,8 @@ // Copyright (C) 2021 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 -#pragma once +#ifndef QOPCUA_OPCUAMETHODARGUMENT_P_H +#define QOPCUA_OPCUAMETHODARGUMENT_P_H #include "qopcuatype.h" #include <QObject> @@ -45,3 +46,5 @@ }; QT_END_NAMESPACE + +#endif // QOPCUA_OPCUAMETHODARGUMENT_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/opcuamethodnode_p.h new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/opcuamethodnode_p.h --- old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/opcuamethodnode_p.h 2024-02-09 23:03:37.000000000 +0100 +++ new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/opcuamethodnode_p.h 2024-03-19 00:53:28.000000000 +0100 @@ -1,7 +1,8 @@ // Copyright (C) 2018 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 -#pragma once +#ifndef QOPCUA_OPCUAMETHODNODE_P_H +#define QOPCUA_OPCUAMETHODNODE_P_H #include <private/opcuanode_p.h> #include <private/opcuamethodargument_p.h> @@ -77,3 +78,5 @@ }; QT_END_NAMESPACE + +#endif // QOPCUA_OPCUAMETHODNODE_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/opcuanode_p.h new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/opcuanode_p.h --- old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/opcuanode_p.h 2024-02-09 23:03:37.000000000 +0100 +++ new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/opcuanode_p.h 2024-03-19 00:53:28.000000000 +0100 @@ -1,7 +1,8 @@ // Copyright (C) 2018 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 -#pragma once +#ifndef QOPCUA_OPCUANODE_P_H +#define QOPCUA_OPCUANODE_P_H #include <private/opcuaconnection_p.h> #include <private/opcuanodeid_p.h> @@ -157,3 +158,5 @@ }; QT_END_NAMESPACE + +#endif // QOPCUA_OPCUANODE_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/opcuanodeid_p.h new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/opcuanodeid_p.h --- old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/opcuanodeid_p.h 2024-02-09 23:03:37.000000000 +0100 +++ new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/opcuanodeid_p.h 2024-03-19 00:53:28.000000000 +0100 @@ -1,7 +1,8 @@ // Copyright (C) 2018 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 -#pragma once +#ifndef QOPCUA_OPCUANODEID_P_H +#define QOPCUA_OPCUANODEID_P_H #include <private/opcuanodeidtype_p.h> @@ -39,3 +40,5 @@ }; QT_END_NAMESPACE + +#endif // QOPCUA_OPCUANODEID_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/opcuanodeidtype_p.h new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/opcuanodeidtype_p.h --- old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/opcuanodeidtype_p.h 2024-02-09 23:03:37.000000000 +0100 +++ new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/opcuanodeidtype_p.h 2024-03-19 00:53:28.000000000 +0100 @@ -1,7 +1,8 @@ // Copyright (C) 2018 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 -#pragma once +#ifndef QOPCUA_OPCUANODEIDTYPE_P_H +#define QOPCUA_OPCUANODEIDTYPE_P_H #include <private/universalnode_p.h> @@ -55,3 +56,5 @@ }; QT_END_NAMESPACE + +#endif // QOPCUA_OPCUANODEIDTYPE_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/opcuapathresolver_p.h new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/opcuapathresolver_p.h --- old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/opcuapathresolver_p.h 2024-02-09 23:03:37.000000000 +0100 +++ new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/opcuapathresolver_p.h 2024-03-19 00:53:28.000000000 +0100 @@ -1,7 +1,8 @@ // Copyright (C) 2018 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 -#pragma once +#ifndef QOPCUA_OPCUAPATHRESOLVER_P_H +#define QOPCUA_OPCUAPATHRESOLVER_P_H #include <private/universalnode_p.h> @@ -57,3 +58,5 @@ }; QT_END_NAMESPACE + +#endif // QOPCUA_OPCUAPATHRESOLVER_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/opcuarelativenodeid_p.h new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/opcuarelativenodeid_p.h --- old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/opcuarelativenodeid_p.h 2024-02-09 23:03:37.000000000 +0100 +++ new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/opcuarelativenodeid_p.h 2024-03-19 00:53:28.000000000 +0100 @@ -1,7 +1,8 @@ // Copyright (C) 2018 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 -#pragma once +#ifndef QOPCUA_OPCUARELATIVENODEID_P_H +#define QOPCUA_OPCUARELATIVENODEID_P_H #include <private/opcuanodeidtype_p.h> @@ -64,3 +65,5 @@ }; QT_END_NAMESPACE + +#endif // QOPCUA_OPCUARELATIVENODEID_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/opcuarelativenodepath_p.h new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/opcuarelativenodepath_p.h --- old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/opcuarelativenodepath_p.h 2024-02-09 23:03:37.000000000 +0100 +++ new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/opcuarelativenodepath_p.h 2024-03-19 00:53:28.000000000 +0100 @@ -1,7 +1,8 @@ // Copyright (C) 2018 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 -#pragma once +#ifndef QOPCUA_OPCUARELATIVENODEPATH_P_H +#define QOPCUA_OPCUARELATIVENODEPATH_P_H #include <QObject> #include <qopcuatype.h> @@ -69,3 +70,5 @@ }; QT_END_NAMESPACE + +#endif // QOPCUA_OPCUARELATIVENODEPATH_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/opcuavaluenode_p.h new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/opcuavaluenode_p.h --- old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/opcuavaluenode_p.h 2024-02-09 23:03:37.000000000 +0100 +++ new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/opcuavaluenode_p.h 2024-03-19 00:53:28.000000000 +0100 @@ -1,7 +1,8 @@ // Copyright (C) 2018 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 -#pragma once +#ifndef QOPCUA_OPCUAVALUENODE_P_H +#define QOPCUA_OPCUAVALUENODE_P_H #include <private/opcuanode_p.h> #include <private/opcuadatachangefilter_p.h> @@ -78,3 +79,5 @@ }; QT_END_NAMESPACE + +#endif // QOPCUA_OPCUAVALUENODE_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/universalnode_p.h new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/universalnode_p.h --- old/qtopcua-everywhere-src-6.6.2/src/declarative_opcua/universalnode_p.h 2024-02-09 23:03:37.000000000 +0100 +++ new/qtopcua-everywhere-src-6.6.3/src/declarative_opcua/universalnode_p.h 2024-03-19 00:53:28.000000000 +0100 @@ -1,7 +1,8 @@ // Copyright (C) 2021 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 -#pragma once +#ifndef QOPCUA_UNIVERSALNODE_P_H +#define QOPCUA_UNIVERSALNODE_P_H #include <QObject> #include <private/qglobal_p.h> @@ -99,3 +100,5 @@ }; QT_END_NAMESPACE + +#endif // QOPCUA_UNIVERSALNODE_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtopcua-everywhere-src-6.6.2/src/opcua/doc/src/qtopcua.qdoc new/qtopcua-everywhere-src-6.6.3/src/opcua/doc/src/qtopcua.qdoc --- old/qtopcua-everywhere-src-6.6.2/src/opcua/doc/src/qtopcua.qdoc 2024-02-09 23:03:37.000000000 +0100 +++ new/qtopcua-everywhere-src-6.6.3/src/opcua/doc/src/qtopcua.qdoc 2024-03-19 00:53:28.000000000 +0100 @@ -102,6 +102,19 @@ \li \l{Qt OPC UA C++ Classes}{C++ Classes} \li \l{Qt OPC UA QML Types}{QML Types} \endlist + + \section1 Licenses and Attributions + + Qt OPC UA is available under commercial licenses from \l{The Qt Company}. + In addition, it is available under free software licenses: + The \l{GNU Lesser General Public License, version 3}, or + the \l{GNU General Public License, version 2}. + See \l{Qt Licensing} for further details. + + Furthermore, Qt OPC UA in Qt \QtVersion may contain third-party + modules under following permissive licenses: + + \annotatedlist attributions-qtopcua */ /*! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtopcua-everywhere-src-6.6.2/src/plugins/opcua/open62541/qopen62541backend.cpp new/qtopcua-everywhere-src-6.6.3/src/plugins/opcua/open62541/qopen62541backend.cpp --- old/qtopcua-everywhere-src-6.6.2/src/plugins/opcua/open62541/qopen62541backend.cpp 2024-02-09 23:03:37.000000000 +0100 +++ new/qtopcua-everywhere-src-6.6.3/src/plugins/opcua/open62541/qopen62541backend.cpp 2024-03-19 00:53:28.000000000 +0100 @@ -58,6 +58,18 @@ { UaDeleter<UA_NodeId> nodeIdDeleter(&id, UA_NodeId_clear); + if (!m_uaclient) { + QList<QOpcUaReadResult> resultMetadata; + + qt_forEachAttribute(attr, [&](QOpcUa::NodeAttribute attribute){ + QOpcUaReadResult temp; + temp.setAttribute(attribute); + resultMetadata.push_back(temp); + }); + emit attributesRead(handle, resultMetadata, QOpcUa::UaStatusCode::BadDisconnect); + return; + } + UA_ReadRequest req; UA_ReadRequest_init(&req); UaDeleter<UA_ReadRequest> requestDeleter(&req, UA_ReadRequest_clear); @@ -105,6 +117,12 @@ void Open62541AsyncBackend::writeAttribute(quint64 handle, UA_NodeId id, QOpcUa::NodeAttribute attrId, QVariant value, QOpcUa::Types type, QString indexRange) { + if (!m_uaclient) { + UA_NodeId_clear(&id); + emit attributeWritten(handle, attrId, value, QOpcUa::UaStatusCode::BadDisconnect); + return; + } + if (type == QOpcUa::Types::Undefined && attrId != QOpcUa::NodeAttribute::Value) type = attributeIdToTypeId(attrId); @@ -139,6 +157,11 @@ { UaDeleter<UA_NodeId> nodeIdDeleter(&id, UA_NodeId_clear); + if (!m_uaclient) { + emit attributeWritten(handle, QOpcUa::NodeAttribute::None, QVariant(), QOpcUa::UaStatusCode::BadDisconnect); + return; + } + if (toWrite.size() == 0) { qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "No values to be written"; emit attributeWritten(handle, QOpcUa::NodeAttribute::None, QVariant(), QOpcUa::UaStatusCode::BadNothingToDo); @@ -179,6 +202,15 @@ { UaDeleter<UA_NodeId> nodeIdDeleter(&id, UA_NodeId_clear); + if (!m_uaclient) { + qt_forEachAttribute(attr, [&](QOpcUa::NodeAttribute attribute){ + QOpcUaMonitoringParameters s; + s.setStatusCode(QOpcUa::UaStatusCode::BadDisconnect); + emit monitoringEnableDisable(handle, attribute, true, s); + }); + return; + } + QOpen62541Subscription *usedSubscription = nullptr; // Create a new subscription if necessary @@ -228,6 +260,15 @@ void Open62541AsyncBackend::disableMonitoring(quint64 handle, QOpcUa::NodeAttributes attr) { + if (!m_uaclient) { + qt_forEachAttribute(attr, [&](QOpcUa::NodeAttribute attribute){ + QOpcUaMonitoringParameters s; + s.setStatusCode(QOpcUa::UaStatusCode::BadDisconnect); + emit monitoringEnableDisable(handle, attribute, false, s); + }); + return; + } + qt_forEachAttribute(attr, [&](QOpcUa::NodeAttribute attribute){ QOpen62541Subscription *sub = getSubscriptionForItem(handle, attribute); if (sub) { @@ -246,6 +287,13 @@ void Open62541AsyncBackend::modifyMonitoring(quint64 handle, QOpcUa::NodeAttribute attr, QOpcUaMonitoringParameters::Parameter item, QVariant value) { + if (!m_uaclient) { + QOpcUaMonitoringParameters p; + p.setStatusCode(QOpcUa::UaStatusCode::BadDisconnect); + emit monitoringStatusChanged(handle, attr, item, p); + return; + } + QOpen62541Subscription *subscription = getSubscriptionForItem(handle, attr); if (!subscription) { qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "Could not modify" << item << ", the monitored item does not exist"; @@ -297,6 +345,13 @@ void Open62541AsyncBackend::callMethod(quint64 handle, UA_NodeId objectId, UA_NodeId methodId, QList<QOpcUa::TypedVariant> args) { + if (!m_uaclient) { + emit methodCallFinished(handle, Open62541Utils::nodeIdToQString(methodId), QVariant(), QOpcUa::UaStatusCode::BadDisconnect); + UA_NodeId_clear(&objectId); + UA_NodeId_clear(&methodId); + return; + } + UA_Variant *inputArgs = nullptr; if (args.size()) { @@ -331,6 +386,12 @@ void Open62541AsyncBackend::resolveBrowsePath(quint64 handle, UA_NodeId startNode, const QList<QOpcUaRelativePathElement> &path) { + if (!m_uaclient) { + UA_NodeId_clear(&startNode); + emit resolveBrowsePathFinished(handle, {}, path, QOpcUa::UaStatusCode::BadDisconnect); + return; + } + UA_TranslateBrowsePathsToNodeIdsRequest req; UA_TranslateBrowsePathsToNodeIdsRequest_init(&req); UaDeleter<UA_TranslateBrowsePathsToNodeIdsRequest> requestDeleter( @@ -465,6 +526,11 @@ void Open62541AsyncBackend::readNodeAttributes(const QList<QOpcUaReadItem> &nodesToRead) { + if (!m_uaclient) { + emit readNodeAttributesFinished({}, QOpcUa::UaStatusCode::BadDisconnect); + return; + } + if (nodesToRead.size() == 0) { emit readNodeAttributesFinished(QList<QOpcUaReadResult>(), QOpcUa::UaStatusCode::BadNothingToDo); return; @@ -502,6 +568,11 @@ void Open62541AsyncBackend::writeNodeAttributes(const QList<QOpcUaWriteItem> &nodesToWrite) { + if (!m_uaclient) { + emit writeNodeAttributesFinished({}, QOpcUa::UaStatusCode::BadDisconnect); + return; + } + if (nodesToWrite.isEmpty()) { emit writeNodeAttributesFinished(QList<QOpcUaWriteResult>(), QOpcUa::UaStatusCode::BadNothingToDo); return; @@ -556,6 +627,11 @@ void Open62541AsyncBackend::readHistoryRaw(QOpcUaHistoryReadRawRequest request, QList<QByteArray> continuationPoints, bool releaseContinuationPoints, quint64 handle) { + if (!m_uaclient) { + emit historyDataAvailable({}, {}, QOpcUa::UaStatusCode::BadDisconnect, handle); + return; + } + if (!continuationPoints.empty() && continuationPoints.size() != request.nodesToRead().size()) { emit historyDataAvailable({}, {}, QOpcUa::UaStatusCode::BadInternalError, handle); return; @@ -604,6 +680,11 @@ void Open62541AsyncBackend::addNode(const QOpcUaAddNodeItem &nodeToAdd) { + if (!m_uaclient) { + emit addNodeFinished(nodeToAdd.requestedNewNodeId(), {}, QOpcUa::UaStatusCode::BadDisconnect); + return; + } + UA_AddNodesRequest req; UA_AddNodesRequest_init(&req); UaDeleter<UA_AddNodesRequest> requestDeleter(&req, UA_AddNodesRequest_clear); @@ -648,6 +729,11 @@ void Open62541AsyncBackend::deleteNode(const QString &nodeId, bool deleteTargetReferences) { + if (!m_uaclient) { + emit deleteNodeFinished(nodeId, QOpcUa::UaStatusCode::BadDisconnect); + return; + } + UA_DeleteNodesRequest request; UA_DeleteNodesRequest_init(&request); UaDeleter<UA_DeleteNodesRequest> requestDeleter(&request, UA_DeleteNodesRequest_clear); @@ -677,6 +763,13 @@ void Open62541AsyncBackend::addReference(const QOpcUaAddReferenceItem &referenceToAdd) { + if (!m_uaclient) { + emit addReferenceFinished(referenceToAdd.sourceNodeId(), referenceToAdd.referenceTypeId(), + referenceToAdd.targetNodeId(), referenceToAdd.isForwardReference(), + QOpcUa::UaStatusCode::BadDisconnect); + return; + } + UA_AddReferencesRequest request; UA_AddReferencesRequest_init(&request); UaDeleter<UA_AddReferencesRequest> requestDeleter(&request, UA_AddReferencesRequest_clear); @@ -716,6 +809,13 @@ void Open62541AsyncBackend::deleteReference(const QOpcUaDeleteReferenceItem &referenceToDelete) { + if (!m_uaclient) { + emit deleteReferenceFinished(referenceToDelete.sourceNodeId(), referenceToDelete.referenceTypeId(), + referenceToDelete.targetNodeId(), referenceToDelete.isForwardReference(), + QOpcUa::UaStatusCode::BadDisconnect); + return; + } + UA_DeleteReferencesRequest request; UA_DeleteReferencesRequest_init(&request); UaDeleter<UA_DeleteReferencesRequest> requestDeleter(&request, UA_DeleteReferencesRequest_clear); @@ -772,6 +872,11 @@ void Open62541AsyncBackend::browse(quint64 handle, UA_NodeId id, const QOpcUaBrowseRequest &request) { + if (!m_uaclient) { + emit browseFinished(handle, {}, QOpcUa::UaStatusCode::BadDisconnect); + return; + } + UA_BrowseRequest uaRequest; UA_BrowseRequest_init(&uaRequest); UaDeleter<UA_BrowseRequest> requestDeleter(&uaRequest, UA_BrowseRequest_clear); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtopcua-everywhere-src-6.6.2/src/plugins/opcua/open62541/qopen62541client.cpp new/qtopcua-everywhere-src-6.6.3/src/plugins/opcua/open62541/qopen62541client.cpp --- old/qtopcua-everywhere-src-6.6.2/src/plugins/opcua/open62541/qopen62541client.cpp 2024-02-09 23:03:37.000000000 +0100 +++ new/qtopcua-everywhere-src-6.6.3/src/plugins/opcua/open62541/qopen62541client.cpp 2024-03-19 00:53:28.000000000 +0100 @@ -57,6 +57,8 @@ { if (m_thread->isRunning()) m_thread->quit(); + + m_thread->wait(); } void QOpen62541Client::connectToEndpoint(const QOpcUaEndpointDescription &endpoint) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtopcua-everywhere-src-6.6.2/tests/auto/clientSetupInCpp/tst_clientSetupInCpp.cpp new/qtopcua-everywhere-src-6.6.3/tests/auto/clientSetupInCpp/tst_clientSetupInCpp.cpp --- old/qtopcua-everywhere-src-6.6.2/tests/auto/clientSetupInCpp/tst_clientSetupInCpp.cpp 2024-02-09 23:03:37.000000000 +0100 +++ new/qtopcua-everywhere-src-6.6.3/tests/auto/clientSetupInCpp/tst_clientSetupInCpp.cpp 2024-03-19 00:53:28.000000000 +0100 @@ -31,6 +31,11 @@ MyClass (QObject* parent = nullptr) : QObject(parent) { } + ~MyClass() { + if (m_client) + delete m_client; + } + QOpcUaClient *connection() const { return m_client; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtopcua-everywhere-src-6.6.2/tests/auto/connection/tst_connection.cpp new/qtopcua-everywhere-src-6.6.3/tests/auto/connection/tst_connection.cpp --- old/qtopcua-everywhere-src-6.6.2/tests/auto/connection/tst_connection.cpp 2024-02-09 23:03:37.000000000 +0100 +++ new/qtopcua-everywhere-src-6.6.3/tests/auto/connection/tst_connection.cpp 2024-03-19 00:53:28.000000000 +0100 @@ -31,6 +31,7 @@ public: Tst_Connection(); + ~Tst_Connection(); private slots: void initTestCase(); @@ -60,6 +61,11 @@ m_backends = QOpcUaProvider::availableBackends(); } +Tst_Connection::~Tst_Connection() +{ + qDeleteAll(m_clients); +} + void Tst_Connection::initTestCase() { const quint16 defaultPort = 43344; @@ -195,6 +201,9 @@ m_serverProcess.kill(); m_serverProcess.waitForFinished(2000); } + + qDeleteAll(m_clients); + m_clients.clear(); } int main(int argc, char *argv[])
