March 2024 - openSUSE Commits - openSUSE Mailing Lists

commit oxygen6 for openSUSE:Factory
by Source-Sync 28 Mar '24

28 Mar '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package oxygen6 for openSUSE:Factory checked in at 2024-03-28 13:54:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oxygen6 (Old) and /work/SRC/openSUSE:Factory/.oxygen6.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "oxygen6" Thu Mar 28 13:54:30 2024 rev:3 rq:1162437 version:6.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/oxygen6/oxygen6.changes 2024-03-14 17:44:50.624905939 +0100 +++ /work/SRC/openSUSE:Factory/.oxygen6.new.1905/oxygen6.changes 2024-03-28 14:23:19.237367951 +0100 @@ -1,0 +2,9 @@ +Tue Mar 26 18:06:01 UTC 2024 - Fabian Vogt <fabian(a)ritter-vogt.de> + +- Update to 6.0.3: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.0.3 +- Changes since 6.0.2: + * update version for new release + +------------------------------------------------------------------- Old: ---- oxygen-6.0.2.tar.xz oxygen-6.0.2.tar.xz.sig New: ---- oxygen-6.0.3.tar.xz oxygen-6.0.3.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen6.spec ++++++ --- /var/tmp/diff_new_pack.YtcgDK/_old 2024-03-28 14:23:27.597675501 +0100 +++ /var/tmp/diff_new_pack.YtcgDK/_new 2024-03-28 14:23:27.597675501 +0100 @@ -34,7 +34,7 @@ # Latest ABI-stable Plasma (e.g. 6.0 in KF6, but 6.0.80 in KUF) %{!?_plasma6_version: %define _plasma6_version %(echo %{_plasma6_bugfix} | awk -F. '{print $1"."$2}')} Name: oxygen6 -Version: 6.0.2 +Version: 6.0.3 Release: 0 Summary: Oxygen style, KWin decoration and cursors License: GPL-2.0-or-later ++++++ oxygen-6.0.2.tar.xz -> oxygen-6.0.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-6.0.2/CMakeLists.txt new/oxygen-6.0.3/CMakeLists.txt --- old/oxygen-6.0.2/CMakeLists.txt 2024-03-12 13:44:35.000000000 +0100 +++ new/oxygen-6.0.3/CMakeLists.txt 2024-03-26 16:03:17.000000000 +0100 @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.25) project(oxygen) -set(PROJECT_VERSION "6.0.2") +set(PROJECT_VERSION "6.0.3") set(PROJECT_VERSION_MAJOR 6) include(GenerateExportHeader) @@ -8,7 +8,7 @@ include(FeatureSummary) ################# Qt/KDE ################# -set(PROJECT_DEP_VERSION "6.0.2") +set(PROJECT_DEP_VERSION "6.0.3") set(QT5_MIN_VERSION "5.15.2") set(KF5_MIN_VERSION "5.102.0") set(QT_MIN_VERSION "6.6.0")

1 0

commit qt6-serialbus for openSUSE:Factory
by Source-Sync 28 Mar '24

28 Mar '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-serialbus for openSUSE:Factory checked in at 2024-03-28 13:54:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-serialbus (Old) and /work/SRC/openSUSE:Factory/.qt6-serialbus.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-serialbus" Thu Mar 28 13:54:27 2024 rev:21 rq:1162395 version:6.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-serialbus/qt6-serialbus.changes 2024-02-18 20:24:43.273370413 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-serialbus.new.1905/qt6-serialbus.changes 2024-03-28 14:22:58.340599225 +0100 @@ -1,0 +2,6 @@ +Tue Mar 26 14:26:43 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.6.3: + * https://www.qt.io/blog/qt-6.6.3-released + +------------------------------------------------------------------- Old: ---- qtserialbus-everywhere-src-6.6.2.tar.xz New: ---- qtserialbus-everywhere-src-6.6.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-serialbus.spec ++++++ --- /var/tmp/diff_new_pack.NEtBCS/_old 2024-03-28 14:23:05.168850415 +0100 +++ /var/tmp/diff_new_pack.NEtBCS/_new 2024-03-28 14:23:05.172850563 +0100 @@ -16,7 +16,7 @@ # -%define real_version 6.6.2 +%define real_version 6.6.3 %define short_version 6.6 %define tar_name qtserialbus-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-serialbus -Version: 6.6.2 +Version: 6.6.3 Release: 0 Summary: Qt 6 SerialBus library License: LGPL-3.0-only OR GPL-2.0-or-later ++++++ qtserialbus-everywhere-src-6.6.2.tar.xz -> qtserialbus-everywhere-src-6.6.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.6.2/.cmake.conf new/qtserialbus-everywhere-src-6.6.3/.cmake.conf --- old/qtserialbus-everywhere-src-6.6.2/.cmake.conf 2024-02-09 19:29:17.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.6.3/.cmake.conf 2024-03-18 18:49:49.000000000 +0100 @@ -1,3 +1,3 @@ -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_NO_AS_CONST=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.6.2/.tag new/qtserialbus-everywhere-src-6.6.3/.tag --- old/qtserialbus-everywhere-src-6.6.2/.tag 2024-02-09 19:29:17.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.6.3/.tag 2024-03-18 18:49:49.000000000 +0100 @@ -1 +1 @@ -05fd0490bf8caa589316973b59b0f80fa5402fef +1df01219add4b862a132b18fce2452143e44228f diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-6.6.2/dependencies.yaml new/qtserialbus-everywhere-src-6.6.3/dependencies.yaml --- old/qtserialbus-everywhere-src-6.6.2/dependencies.yaml 2024-02-09 19:29:17.000000000 +0100 +++ new/qtserialbus-everywhere-src-6.6.3/dependencies.yaml 2024-03-18 18:49:49.000000000 +0100 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: dec1863c7dc63e5788b0c6c061d36e856a6ae2b2 + ref: afdec885058c92e24604f398a926297222da06f3 required: true ../qtserialport: - ref: deabc07b4c6b5f1f4fbbfc89ce416e5a06587030 + ref: 477a3b977154284ecad6ea9b68b62bf54b04bc89 required: false

1 0

commit qt6-quick3dphysics for openSUSE:Factory
by Source-Sync 28 Mar '24

28 Mar '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-quick3dphysics for openSUSE:Factory checked in at 2024-03-28 13:54:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-quick3dphysics (Old) and /work/SRC/openSUSE:Factory/.qt6-quick3dphysics.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-quick3dphysics" Thu Mar 28 13:54:23 2024 rev:13 rq:1162389 version:6.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-quick3dphysics/qt6-quick3dphysics.changes 2024-02-18 20:24:31.184934172 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-quick3dphysics.new.1905/qt6-quick3dphysics.changes 2024-03-28 14:22:11.978893725 +0100 @@ -1,0 +2,6 @@ +Tue Mar 26 14:26:25 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.6.3: + * https://www.qt.io/blog/qt-6.6.3-released + +------------------------------------------------------------------- Old: ---- qtquick3dphysics-everywhere-src-6.6.2.tar.xz New: ---- qtquick3dphysics-everywhere-src-6.6.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-quick3dphysics.spec ++++++ --- /var/tmp/diff_new_pack.kebsfj/_old 2024-03-28 14:22:17.803107980 +0100 +++ /var/tmp/diff_new_pack.kebsfj/_new 2024-03-28 14:22:17.803107980 +0100 @@ -16,7 +16,7 @@ # -%define real_version 6.6.2 +%define real_version 6.6.3 %define short_version 6.6 %define tar_name qtquick3dphysics-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-quick3dphysics%{?pkg_suffix} -Version: 6.6.2 +Version: 6.6.3 Release: 0 Summary: Qt 6 Quick3D Physics Extensions License: GPL-3.0-only ++++++ qtquick3dphysics-everywhere-src-6.6.2.tar.xz -> qtquick3dphysics-everywhere-src-6.6.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.6.2/.cmake.conf new/qtquick3dphysics-everywhere-src-6.6.3/.cmake.conf --- old/qtquick3dphysics-everywhere-src-6.6.2/.cmake.conf 2024-02-10 01:08:30.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.6.3/.cmake.conf 2024-03-19 06:09:33.000000000 +0100 @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.6.2") +set(QT_REPO_MODULE_VERSION "6.6.3") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.6.2/.tag new/qtquick3dphysics-everywhere-src-6.6.3/.tag --- old/qtquick3dphysics-everywhere-src-6.6.2/.tag 2024-02-10 01:08:30.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.6.3/.tag 2024-03-19 06:09:33.000000000 +0100 @@ -1 +1 @@ -40678c93c7fffca82f5915114def549d52c3b950 +007b89ee9b505428224a0178a443d0bdba6b20fe diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.6.2/dependencies.yaml new/qtquick3dphysics-everywhere-src-6.6.3/dependencies.yaml --- old/qtquick3dphysics-everywhere-src-6.6.2/dependencies.yaml 2024-02-10 01:08:30.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.6.3/dependencies.yaml 2024-03-19 06:09:33.000000000 +0100 @@ -1,13 +1,13 @@ dependencies: ../qtbase: - ref: dec1863c7dc63e5788b0c6c061d36e856a6ae2b2 + ref: afdec885058c92e24604f398a926297222da06f3 required: true ../qtdeclarative: - ref: b3d82373ac90e54ad4cbab0c16709a19a9441beb + ref: ab5521fd1a637739c7e91def84caa84426055aff required: true ../qtquick3d: - ref: 6dd4377a636493f28df279b2fe0abcdcaa67e0b0 + ref: 94144b1fd579627b8f96116e6af362fc43e0ba85 required: true ../qtshadertools: - ref: 890783bc860332041cd5526e51a5b28c2042f428 + ref: 58c70c631af3372ed20e042cf41159c6b754df06 required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.6.2/examples/quick3dphysics/material/main.qml new/qtquick3dphysics-everywhere-src-6.6.3/examples/quick3dphysics/material/main.qml --- old/qtquick3dphysics-everywhere-src-6.6.2/examples/quick3dphysics/material/main.qml 2024-02-10 01:08:30.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.6.3/examples/quick3dphysics/material/main.qml 2024-03-19 06:09:33.000000000 +0100 @@ -63,6 +63,8 @@ materials: DefaultMaterial { diffuseColor: "green" } + castsShadows: false + receivesShadows: true } } //! [floor] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.6.2/src/quick3dphysics/physxnode/qphysxactorbody.cpp new/qtquick3dphysics-everywhere-src-6.6.3/src/quick3dphysics/physxnode/qphysxactorbody.cpp --- old/qtquick3dphysics-everywhere-src-6.6.2/src/quick3dphysics/physxnode/qphysxactorbody.cpp 2024-02-10 01:08:30.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.6.3/src/quick3dphysics/physxnode/qphysxactorbody.cpp 2024-03-19 06:09:33.000000000 +0100 @@ -24,21 +24,12 @@ QT_BEGIN_NAMESPACE -static const QQuaternion kMinus90YawRotation = QQuaternion::fromEulerAngles(0, -90, 0); - -static inline bool fuzzyEquals(const physx::PxTransform &a, const physx::PxTransform &b) -{ - return qFuzzyCompare(a.p.x, b.p.x) && qFuzzyCompare(a.p.y, b.p.y) && qFuzzyCompare(a.p.z, b.p.z) - && qFuzzyCompare(a.q.x, b.q.x) && qFuzzyCompare(a.q.y, b.q.y) - && qFuzzyCompare(a.q.z, b.q.z) && qFuzzyCompare(a.q.w, b.q.w); -} - static physx::PxTransform getPhysXLocalTransform(const QQuick3DNode *node) { // Modify transforms to make the PhysX shapes match the QtQuick3D conventions if (qobject_cast<const QPlaneShape *>(node) != nullptr) { // Rotate the plane to make it match the built-in rectangle - const QQuaternion rotation = kMinus90YawRotation * node->rotation(); + const QQuaternion rotation = QPhysicsUtils::kMinus90YawRotation * node->rotation(); return physx::PxTransform(QPhysicsUtils::toPhysXType(node->position()), QPhysicsUtils::toPhysXType(rotation)); } else if (auto *hf = qobject_cast<const QHeightFieldShape *>(node)) { @@ -115,7 +106,7 @@ auto poseNew = getPhysXLocalTransform(collisionShapes[i]); auto poseOld = physXShapes[i]->getLocalPose(); - if (!fuzzyEquals(poseNew, poseOld)) { + if (!QPhysicsUtils::fuzzyEquals(poseNew, poseOld)) { setShapesDirty(true); break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.6.2/src/quick3dphysics/physxnode/qphysxstaticbody.cpp new/qtquick3dphysics-everywhere-src-6.6.3/src/quick3dphysics/physxnode/qphysxstaticbody.cpp --- old/qtquick3dphysics-everywhere-src-6.6.2/src/quick3dphysics/physxnode/qphysxstaticbody.cpp 2024-02-10 01:08:30.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.6.3/src/quick3dphysics/physxnode/qphysxstaticbody.cpp 2024-03-19 06:09:33.000000000 +0100 @@ -14,13 +14,6 @@ QT_BEGIN_NAMESPACE -static inline bool fuzzyEquals(const physx::PxTransform &a, const physx::PxTransform &b) -{ - return qFuzzyCompare(a.p.x, b.p.x) && qFuzzyCompare(a.p.y, b.p.y) && qFuzzyCompare(a.p.z, b.p.z) - && qFuzzyCompare(a.q.x, b.q.x) && qFuzzyCompare(a.q.y, b.q.y) - && qFuzzyCompare(a.q.z, b.q.z) && qFuzzyCompare(a.q.w, b.q.w); -} - QPhysXStaticBody::QPhysXStaticBody(QStaticRigidBody *frontEnd) : QPhysXRigidBody(frontEnd) { } DebugDrawBodyType QPhysXStaticBody::getDebugDrawBodyType() @@ -36,7 +29,7 @@ const physx::PxTransform poseOld = actor->getGlobalPose(); // For performance we only update static objects if they have been moved - if (!fuzzyEquals(poseNew, poseOld)) + if (!QPhysicsUtils::fuzzyEquals(poseNew, poseOld)) actor->setGlobalPose(poseNew); QPhysXActorBody::sync(deltaTime, transformCache); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.6.2/src/quick3dphysics/physxnode/qphysxworld.cpp new/qtquick3dphysics-everywhere-src-6.6.3/src/quick3dphysics/physxnode/qphysxworld.cpp --- old/qtquick3dphysics-everywhere-src-6.6.2/src/quick3dphysics/physxnode/qphysxworld.cpp 2024-02-10 01:08:30.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.6.3/src/quick3dphysics/physxnode/qphysxworld.cpp 2024-03-19 06:09:33.000000000 +0100 @@ -91,8 +91,9 @@ QAbstractPhysicsNode *other = static_cast<QAbstractPhysicsNode *>(pairHeader.actors[1]->userData); - if (!trigger || !other || !trigger->m_backendObject || !other->m_backendObject - || world->isNodeRemoved(trigger) || world->isNodeRemoved(other)) + if (!trigger || !other || world->isNodeRemoved(trigger) + || world->isNodeRemoved(other) || !trigger->m_backendObject + || !other->m_backendObject) continue; const bool triggerReceive = @@ -130,9 +131,9 @@ } if (triggerReceive) - trigger->registerContact(other, positions, impulses, normals); + world->registerContact(other, trigger, positions, impulses, normals); if (otherReceive) - other->registerContact(trigger, positions, impulses, normalsInverted); + world->registerContact(trigger, other, positions, impulses, normalsInverted); } } }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.6.2/src/quick3dphysics/qphysicsutils_p.h new/qtquick3dphysics-everywhere-src-6.6.3/src/quick3dphysics/qphysicsutils_p.h --- old/qtquick3dphysics-everywhere-src-6.6.2/src/quick3dphysics/qphysicsutils_p.h 2024-02-10 01:08:30.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.6.3/src/quick3dphysics/qphysicsutils_p.h 2024-03-19 06:09:33.000000000 +0100 @@ -59,6 +59,15 @@ return physx::PxTransform(QPhysicsUtils::toPhysXType(position), QPhysicsUtils::toPhysXType(rotation)); } + +Q_ALWAYS_INLINE bool fuzzyEquals(const physx::PxTransform &a, const physx::PxTransform &b) +{ + return qFuzzyCompare(a.p.x, b.p.x) && qFuzzyCompare(a.p.y, b.p.y) && qFuzzyCompare(a.p.z, b.p.z) + && qFuzzyCompare(a.q.x, b.q.x) && qFuzzyCompare(a.q.y, b.q.y) + && qFuzzyCompare(a.q.z, b.q.z) && qFuzzyCompare(a.q.w, b.q.w); +} + +inline const QQuaternion kMinus90YawRotation = QQuaternion::fromEulerAngles(0, -90, 0); } #endif // QPHYSICSUTILS_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.6.2/src/quick3dphysics/qphysicsworld.cpp new/qtquick3dphysics-everywhere-src-6.6.3/src/quick3dphysics/qphysicsworld.cpp --- old/qtquick3dphysics-everywhere-src-6.6.2/src/quick3dphysics/qphysicsworld.cpp 2024-02-10 01:08:30.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.6.3/src/quick3dphysics/qphysicsworld.cpp 2024-03-19 06:09:33.000000000 +0100 @@ -146,8 +146,6 @@ Q_LOGGING_CATEGORY(lcQuick3dPhysics, "qt.quick3d.physics"); -static const QQuaternion kMinus90YawRotation = QQuaternion::fromEulerAngles(0, -90, 0); - ///////////////////////////////////////////////////////////////////////////// class SimulationWorker : public QObject @@ -308,18 +306,39 @@ { for (auto world : worldManager.worlds) { world->m_newPhysicsNodes.removeAll(physicsNode); + QMutexLocker locker(&world->m_removedPhysicsNodesMutex); if (physicsNode->m_backendObject) { Q_ASSERT(physicsNode->m_backendObject->frontendNode == physicsNode); physicsNode->m_backendObject->frontendNode = nullptr; physicsNode->m_backendObject->isRemoved = true; physicsNode->m_backendObject = nullptr; } - QMutexLocker locker(&world->m_removedPhysicsNodesMutex); world->m_removedPhysicsNodes.insert(physicsNode); } worldManager.orphanNodes.removeAll(physicsNode); } +void QPhysicsWorld::registerContact(QAbstractPhysicsNode *sender, QAbstractPhysicsNode *receiver, + const QVector<QVector3D> &positions, + const QVector<QVector3D> &impulses, + const QVector<QVector3D> &normals) +{ + // Since collision callbacks happen in the physx simulation thread we need + // to store these callbacks. Otherwise, if an object is deleted in the same + // frame a 'onBodyContact' signal is enqueued and a crash will happen. + // Therefore we save these contact callbacks and run them at the end of the + // physics frame when we know if the objects are deleted or not. + + BodyContact contact; + contact.sender = sender; + contact.receiver = receiver; + contact.positions = positions; + contact.impulses = impulses; + contact.normals = normals; + + m_registeredContacts.push_back(contact); +} + QPhysicsWorld::QPhysicsWorld(QObject *parent) : QObject(parent) { m_inDesignStudio = !qEnvironmentVariableIsEmpty("QML_PUPPET_MODE"); @@ -643,7 +662,7 @@ physXShape->getPlaneGeometry(planeGeometry); // Special rotation const QQuaternion rotation = - kMinus90YawRotation * QPhysicsUtils::toQtType(localPose.q); + QPhysicsUtils::kMinus90YawRotation * QPhysicsUtils::toQtType(localPose.q); localPose = physx::PxTransform(localPose.p, QPhysicsUtils::toPhysXType(rotation)); if (model->geometry() == nullptr) { @@ -1097,6 +1116,7 @@ void QPhysicsWorld::frameFinished(float deltaTime) { matchOrphanNodes(); + emitContactCallbacks(); cleanupRemovedNodes(); for (auto *node : std::as_const(m_newPhysicsNodes)) { auto *body = node->createPhysXBackend(); @@ -1127,6 +1147,7 @@ { // Note sure if this is needed but do it anyway matchOrphanNodes(); + emitContactCallbacks(); cleanupRemovedNodes(); // Ignore new physics nodes, we find them from the scene node anyway m_newPhysicsNodes.clear(); @@ -1209,6 +1230,19 @@ } } +void QPhysicsWorld::emitContactCallbacks() +{ + for (const QPhysicsWorld::BodyContact &contact : m_registeredContacts) { + if (m_removedPhysicsNodes.contains(contact.sender) + || m_removedPhysicsNodes.contains(contact.receiver)) + continue; + contact.receiver->registerContact(contact.sender, contact.positions, contact.impulses, + contact.normals); + } + + m_registeredContacts.clear(); +} + physx::PxPhysics *QPhysicsWorld::getPhysics() { return StaticPhysXObjects::getReference().physics; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.6.2/src/quick3dphysics/qphysicsworld_p.h new/qtquick3dphysics-everywhere-src-6.6.3/src/quick3dphysics/qphysicsworld_p.h --- old/qtquick3dphysics-everywhere-src-6.6.2/src/quick3dphysics/qphysicsworld_p.h 2024-02-10 01:08:30.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.6.3/src/quick3dphysics/qphysicsworld_p.h 2024-03-19 06:09:33.000000000 +0100 @@ -104,6 +104,10 @@ static void registerNode(QAbstractPhysicsNode *physicsNode); static void deregisterNode(QAbstractPhysicsNode *physicsNode); + void registerContact(QAbstractPhysicsNode *sender, QAbstractPhysicsNode *receiver, + const QVector<QVector3D> &positions, const QVector<QVector3D> &impulses, + const QVector<QVector3D> &normals); + Q_REVISION(6, 5) QQuick3DNode *viewport() const; void setHasIndividualDebugDraw(); physx::PxControllerManager *controllerManager(); @@ -148,6 +152,16 @@ void disableDebugDraw(); void matchOrphanNodes(); void findPhysicsNodes(); + void emitContactCallbacks(); + + struct BodyContact + { + QAbstractPhysicsNode *sender = nullptr; + QAbstractPhysicsNode *receiver = nullptr; + QVector<QVector3D> positions; + QVector<QVector3D> impulses; + QVector<QVector3D> normals; + }; struct DebugModelHolder { @@ -194,6 +208,7 @@ m_collisionShapeDebugModels; QSet<QAbstractPhysicsNode *> m_removedPhysicsNodes; QMutex m_removedPhysicsNodesMutex; + QList<BodyContact> m_registeredContacts; QVector3D m_gravity = QVector3D(0.f, -981.f, 0.f); float m_typicalLength = 100.f; // 100 cm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.6.2/tests/auto/CMakeLists.txt new/qtquick3dphysics-everywhere-src-6.6.3/tests/auto/CMakeLists.txt --- old/qtquick3dphysics-everywhere-src-6.6.2/tests/auto/CMakeLists.txt 2024-02-10 01:08:30.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.6.3/tests/auto/CMakeLists.txt 2024-03-19 06:09:33.000000000 +0100 @@ -1,4 +1,5 @@ add_subdirectory(callback) +add_subdirectory(callback_create_delete_node) add_subdirectory(changescene) add_subdirectory(character) add_subdirectory(character_remove) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.6.2/tests/auto/callback_create_delete_node/Box.qml new/qtquick3dphysics-everywhere-src-6.6.3/tests/auto/callback_create_delete_node/Box.qml --- old/qtquick3dphysics-everywhere-src-6.6.2/tests/auto/callback_create_delete_node/Box.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.6.3/tests/auto/callback_create_delete_node/Box.qml 2024-03-19 06:09:33.000000000 +0100 @@ -0,0 +1,21 @@ +// Copyright (C) 2024 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +import QtQuick +import QtQuick3D +import QtQuick3D.Physics + +DynamicRigidBody { + Model { + source: "#Cube" + materials: PrincipledMaterial { + baseColor: "red" + } + } + + sendContactReports: true + receiveContactReports: true + onBodyContact: (body, positions, impulses, normals) => {} + + collisionShapes: BoxShape {} +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.6.2/tests/auto/callback_create_delete_node/CMakeLists.txt new/qtquick3dphysics-everywhere-src-6.6.3/tests/auto/callback_create_delete_node/CMakeLists.txt --- old/qtquick3dphysics-everywhere-src-6.6.2/tests/auto/callback_create_delete_node/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.6.3/tests/auto/callback_create_delete_node/CMakeLists.txt 2024-03-19 06:09:33.000000000 +0100 @@ -0,0 +1,22 @@ +# Copyright (C) 2024 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + +set(PROJECT_NAME "test_auto_callback_create_delete_node") + +qt_internal_add_test(${PROJECT_NAME} + GUI + QMLTEST + SOURCES + tst_callback_create_delete_node.cpp + LIBRARIES + Qt::Core + Qt::Qml + TESTDATA + tst_callback_create_delete_node.qml + Box.qml + BUILTIN_TESTDATA +) + +if(QT_BUILD_STANDALONE_TESTS) + qt_import_qml_plugins(${PROJECT_NAME}) +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.6.2/tests/auto/callback_create_delete_node/tst_callback_create_delete_node.cpp new/qtquick3dphysics-everywhere-src-6.6.3/tests/auto/callback_create_delete_node/tst_callback_create_delete_node.cpp --- old/qtquick3dphysics-everywhere-src-6.6.2/tests/auto/callback_create_delete_node/tst_callback_create_delete_node.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.6.3/tests/auto/callback_create_delete_node/tst_callback_create_delete_node.cpp 2024-03-19 06:09:33.000000000 +0100 @@ -0,0 +1,21 @@ +// Copyright (C) 2024 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + +#include <QtQuickTest/quicktest.h> +class tst_callback_create_delete_node : public QObject +{ + Q_OBJECT +private slots: + void skiptest() { QSKIP("This test will fail, skipping."); }; +}; +int main(int argc, char **argv) +{ + if (!qEnvironmentVariableIsEmpty("QEMU_LD_PREFIX")) { + qWarning("This test is unstable on QEMU, so it will be skipped."); + tst_callback_create_delete_node skip; + return QTest::qExec(&skip, argc, argv); + } + QTEST_SET_MAIN_SOURCE_PATH + return quick_test_main(argc, argv, "tst_callback_create_delete_node", QUICK_TEST_SOURCE_DIR); +} +#include "tst_callback_create_delete_node.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.6.2/tests/auto/callback_create_delete_node/tst_callback_create_delete_node.qml new/qtquick3dphysics-everywhere-src-6.6.3/tests/auto/callback_create_delete_node/tst_callback_create_delete_node.qml --- old/qtquick3dphysics-everywhere-src-6.6.2/tests/auto/callback_create_delete_node/tst_callback_create_delete_node.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.6.3/tests/auto/callback_create_delete_node/tst_callback_create_delete_node.qml 2024-03-19 06:09:33.000000000 +0100 @@ -0,0 +1,104 @@ +// Copyright (C) 2024 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +// Tests that removing and adding objects with active contact callbacks +// does not crash. QTBUG-121033 + +import QtCore +import QtTest +import QtQuick3D +import QtQuick3D.Physics +import QtQuick3D.Physics.Helpers +import QtQuick + +Item { + width: 800 + height: 600 + visible: true + + PhysicsWorld { + scene: viewport.scene + } + + View3D { + id: viewport + width: parent.width + height: parent.height + focus: true + + environment: SceneEnvironment { + antialiasingMode: SceneEnvironment.MSAA + backgroundMode: SceneEnvironment.Color + clearColor: "#f0f0f0" + } + + PerspectiveCamera { + id: camera + position: Qt.vector3d(-400, 500, 1000) + eulerRotation: Qt.vector3d(-20, -20, 0) + clipFar: 5000 + clipNear: 1 + } + + DirectionalLight { + eulerRotation: Qt.vector3d(-45, 45, 0) + } + + Node { + id: shapeSpawner + property var instancesBoxes: [] + property var boxComponent: Qt.createComponent("Box.qml") + property int numSpawns: 0 + + function createStack() { + let size = 10 + + for (var i = 0; i < 3; i++) { + for (var j = 0; j < 3; j++) { + let center = Qt.vector3d(j*100, 100*i, 0) + let box = boxComponent.incubateObject(shapeSpawner, { + "position": center, + }) + instancesBoxes.push(box) + } + } + + numSpawns = numSpawns + 1; + } + + function reset() { + // Only run method if previous stack has been created fully + for (var i = 0; i < instancesBoxes.length; i++) + if (!instancesBoxes[i].object) + return + + instancesBoxes.forEach(box => { + box.object.collisionShapes = [] + box.object.destroy() + }) + instancesBoxes = [] + + shapeSpawner.createStack() + } + } + } + + FrameAnimation { + property int frame: 0 + running: true + onTriggered: { + frame = frame + 1; + if (frame % 2 == 0) { + shapeSpawner.reset() + } + } + } + + TestCase { + name: "100 cycles" + when: shapeSpawner.numSpawns > 100 + function triggered() {} + } + +} +

1 0

commit qt6-opcua for openSUSE:Factory
by Source-Sync 28 Mar '24

28 Mar '24

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 <christophe(a)krop.fr> + +- 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[])

1 0

commit qt6-mqtt for openSUSE:Factory
by Source-Sync 28 Mar '24

28 Mar '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-mqtt for openSUSE:Factory checked in at 2024-03-28 13:54:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-mqtt (Old) and /work/SRC/openSUSE:Factory/.qt6-mqtt.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-mqtt" Thu Mar 28 13:54:21 2024 rev:27 rq:1162382 version:6.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-mqtt/qt6-mqtt.changes 2024-02-18 20:24:20.532549754 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-mqtt.new.1905/qt6-mqtt.changes 2024-03-28 14:21:51.406136918 +0100 @@ -1,0 +2,6 @@ +Tue Mar 26 14:26:02 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.6.3: + * https://www.qt.io/blog/qt-6.6.3-released + +------------------------------------------------------------------- Old: ---- qtmqtt-everywhere-src-6.6.2.tar.xz New: ---- qtmqtt-everywhere-src-6.6.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-mqtt.spec ++++++ --- /var/tmp/diff_new_pack.7WWgpS/_old 2024-03-28 14:22:02.526546003 +0100 +++ /var/tmp/diff_new_pack.7WWgpS/_new 2024-03-28 14:22:02.526546003 +0100 @@ -1,7 +1,7 @@ # # spec file for package qt6-mqtt # -# 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 qtmqtt-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-mqtt%{?pkg_suffix} -Version: 6.6.2 +Version: 6.6.3 Release: 0 Summary: Qt 6 Module to implement MQTT protocol version 3.1 and 3.1.1 License: GPL-3.0-only WITH Qt-GPL-exception-1.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.7WWgpS/_old 2024-03-28 14:22:02.566547475 +0100 +++ /var/tmp/diff_new_pack.7WWgpS/_new 2024-03-28 14:22:02.570547622 +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/qtmqtt.git</param> - <param name="revision">v6.6.2</param> + <param name="revision">v6.6.3</param> <param name="scm">git</param> <param name="filename">qtmqtt-everywhere-src</param> </service> ++++++ qtmqtt-everywhere-src-6.6.2.tar.xz -> qtmqtt-everywhere-src-6.6.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-everywhere-src-6.6.2/.cmake.conf new/qtmqtt-everywhere-src-6.6.3/.cmake.conf --- old/qtmqtt-everywhere-src-6.6.2/.cmake.conf 2024-02-09 23:03:31.000000000 +0100 +++ new/qtmqtt-everywhere-src-6.6.3/.cmake.conf 2024-03-19 00:53:40.000000000 +0100 @@ -1,3 +1,3 @@ -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_NO_AS_CONST=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-everywhere-src-6.6.2/dependencies.yaml new/qtmqtt-everywhere-src-6.6.3/dependencies.yaml --- old/qtmqtt-everywhere-src-6.6.2/dependencies.yaml 2024-02-09 23:03:31.000000000 +0100 +++ new/qtmqtt-everywhere-src-6.6.3/dependencies.yaml 2024-03-19 00:53:40.000000000 +0100 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: dec1863c7dc63e5788b0c6c061d36e856a6ae2b2 + ref: afdec885058c92e24604f398a926297222da06f3 required: true ../qtdeclarative: - ref: b3d82373ac90e54ad4cbab0c16709a19a9441beb + ref: ab5521fd1a637739c7e91def84caa84426055aff required: true

1 0

commit qt6-location for openSUSE:Factory
by Source-Sync 28 Mar '24

28 Mar '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-location for openSUSE:Factory checked in at 2024-03-28 13:54:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-location (Old) and /work/SRC/openSUSE:Factory/.qt6-location.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-location" Thu Mar 28 13:54:19 2024 rev:10 rq:1162380 version:6.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-location/qt6-location.changes 2024-02-18 20:24:16.368399481 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-location.new.1905/qt6-location.changes 2024-03-28 14:21:27.661263456 +0100 @@ -1,0 +2,6 @@ +Tue Mar 26 14:25:55 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.6.3: + * https://www.qt.io/blog/qt-6.6.3-released + +------------------------------------------------------------------- Old: ---- qtlocation-everywhere-src-6.6.2.tar.xz New: ---- qtlocation-everywhere-src-6.6.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-location.spec ++++++ --- /var/tmp/diff_new_pack.Piuknt/_old 2024-03-28 14:21:38.657667943 +0100 +++ /var/tmp/diff_new_pack.Piuknt/_new 2024-03-28 14:21:38.657667943 +0100 @@ -16,7 +16,7 @@ # -%define real_version 6.6.2 +%define real_version 6.6.3 %define short_version 6.6 %define tar_name qtlocation-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-location%{?pkg_suffix} -Version: 6.6.2 +Version: 6.6.3 Release: 0 Summary: Qt 6 Location plugins and libraries License: GPL-3.0-or-later ++++++ qtlocation-everywhere-src-6.6.2.tar.xz -> qtlocation-everywhere-src-6.6.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/.cmake.conf new/qtlocation-everywhere-src-6.6.3/.cmake.conf --- old/qtlocation-everywhere-src-6.6.2/.cmake.conf 2024-02-09 23:39:30.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/.cmake.conf 2024-03-19 02:59:08.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") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/.tag new/qtlocation-everywhere-src-6.6.3/.tag --- old/qtlocation-everywhere-src-6.6.2/.tag 2024-02-09 23:39:30.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/.tag 2024-03-19 02:59:08.000000000 +0100 @@ -1 +1 @@ -5dfd658464ee3a6f844ccbc99f1999965b684eaa +0bb0e7bab232ba0832619ff3397040d25677b0f5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/dependencies.yaml new/qtlocation-everywhere-src-6.6.3/dependencies.yaml --- old/qtlocation-everywhere-src-6.6.2/dependencies.yaml 2024-02-09 23:39:30.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/dependencies.yaml 2024-03-19 02:59:08.000000000 +0100 @@ -1,10 +1,10 @@ dependencies: ../qtbase: - ref: dec1863c7dc63e5788b0c6c061d36e856a6ae2b2 + ref: afdec885058c92e24604f398a926297222da06f3 required: true ../qtdeclarative: - ref: b3d82373ac90e54ad4cbab0c16709a19a9441beb + ref: ab5521fd1a637739c7e91def84caa84426055aff required: true ../qtpositioning: - ref: 892867ff97a300a158dc37cded2ebb1c777fc310 + ref: 31cc09838d78da554afea162ea5a94bb45e489c6 required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/examples/location/mapviewer/Main.qml new/qtlocation-everywhere-src-6.6.3/examples/location/mapviewer/Main.qml --- old/qtlocation-everywhere-src-6.6.2/examples/location/mapviewer/Main.qml 2024-02-09 23:39:30.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/examples/location/mapviewer/Main.qml 2024-03-19 02:59:08.000000000 +0100 @@ -1,6 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +import QtCore import QtQuick import QtQuick.Controls import QtLocation @@ -221,7 +222,10 @@ stackView.pop(page) switch (state) { case "FollowMe": - mapview.followme = !mapview.followme + if (!mapview.followme && (permission.status !== Qt.Granted)) + permissionDialog.open(); + else + mapview.followme = !mapview.followme break case "MiniMap": toggleMiniMapState() @@ -457,4 +461,42 @@ } } } + + LocationPermission { + id: permission + accuracy: LocationPermission.Precise + availability: LocationPermission.WhenInUse + } + + Dialog { + id: permissionDialog + anchors.centerIn: parent + padding: 20 + standardButtons: (permission.status === Qt.Denied) ? Dialog.Close + : Dialog.Close | Dialog.Ok + closePolicy: Dialog.NoAutoClose + title: qsTr("Permission") + + Label { + id: permissionRequestText + text: (permission.status === Qt.Denied) + ? qsTr("Grant the location permission then open the app again.") + : qsTr("Location permission is needed.") + } + + onAccepted: { + if (permission.status !== Qt.Denied) + permission.request(); + } + + onStandardButtonsChanged: { + if (standardButtons & Dialog.Ok) + standardButton(Dialog.Ok).text = qsTr("Request Permission"); + } + + Component.onCompleted: { + if (permission.status !== Qt.Granted) + open(); + } + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/CMakeLists.txt new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/CMakeLists.txt --- old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/CMakeLists.txt 2024-02-09 23:39:30.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/CMakeLists.txt 2024-03-19 02:59:08.000000000 +0100 @@ -38,7 +38,9 @@ # Resources: set(places_map_resource_files "marker.png" - "places_map.qml" + "Main.qml" + "PermissionsScreen.qml" + "PlacesMap.qml" ) qt6_add_resources(places_map "places_map" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/Main.qml new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/Main.qml --- old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/Main.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/Main.qml 2024-03-19 02:59:08.000000000 +0100 @@ -0,0 +1,34 @@ +// Copyright (C) 2024 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +import QtCore +import QtQuick + +Item { + id: root + anchors.fill: parent + + LocationPermission { + id: permission + accuracy: LocationPermission.Precise + availability: LocationPermission.WhenInUse + } + + PermissionsScreen { + anchors.fill: parent + visible: permission.status !== Qt.PermissionStatus.Granted + requestDenied: permission.status === Qt.PermissionStatus.Denied + onRequestPermission: permission.request() + } + + Component { + id: applicationComponent + PlacesMap {} + } + + Loader { + anchors.fill: parent + active: permission.status === Qt.PermissionStatus.Granted + sourceComponent: applicationComponent + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/PermissionsScreen.qml new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/PermissionsScreen.qml --- old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/PermissionsScreen.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/PermissionsScreen.qml 2024-03-19 02:59:08.000000000 +0100 @@ -0,0 +1,48 @@ +// Copyright (C) 2024 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +import QtQuick + +Rectangle { + id: root + + property bool requestDenied: false + + signal requestPermission + + Text { + id: textItem + anchors.centerIn: parent + text: root.requestDenied + ? qsTr("The application cannot run because the Location permission\n" + + "was not granted.\n" + + "Please grant the permission and restart the application.") + : qsTr("The application requires the Location permission to get\n" + + "the position and satellite information.\n" + + "Please press the button to request the permission.") + } + // custom button without importing Quick.Controls + Rectangle { + anchors { + top: textItem.bottom + topMargin: 10 + horizontalCenter: parent.horizontalCenter + } + visible: !root.requestDenied + width: parent.width * 0.8 + height: buttonText.implicitHeight * 2 + border.width: 1 + + Text { + id: buttonText + anchors.fill: parent + text: qsTr("Request Permission") + horizontalAlignment: Qt.AlignHCenter + verticalAlignment: Qt.AlignVCenter + MouseArea { + anchors.fill: parent + onClicked: root.requestPermission() + } + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/PlacesMap.qml new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/PlacesMap.qml --- old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/PlacesMap.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/PlacesMap.qml 2024-03-19 02:59:08.000000000 +0100 @@ -0,0 +1,85 @@ +// Copyright (C) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +//! [Imports] +import QtQuick +import QtPositioning +import QtLocation +//! [Imports] + +Rectangle { + anchors.fill: parent + + //! [Initialize Plugin] + Plugin { + id: myPlugin + name: "osm" + //specify plugin parameters if necessary + //PluginParameter {...} + //PluginParameter {...} + //... + } + //! [Initialize Plugin] + + //! [Current Location] + PositionSource { + id: positionSource + property variant lastSearchPosition: QtPositioning.coordinate(59.93, 10.76) //Initialized/Fallback to Oslo + active: true + updateInterval: 120000 // 2 mins + onPositionChanged: { + var distance = lastSearchPosition.distanceTo(position.coordinate) + if (distance > 500) { + // 500m from last performed food search + lastSearchPosition = positionSource.position.coordinate + } + } + } + //! [Current Location] + + //! [PlaceSearchModel] + PlaceSearchModel { + id: searchModel + + plugin: myPlugin + + searchTerm: "food" + searchArea: QtPositioning.circle(positionSource.lastSearchPosition, 1000 /* 1 km radius */) + Component.onCompleted: update() + } + //! [PlaceSearchModel] + + //! [Places MapItemView] + MapView { + id: view + anchors.fill: parent + map.plugin: myPlugin; + map.center: positionSource.lastSearchPosition + map.zoomLevel: 13 + + MapItemView { + model: searchModel + parent: view.map + delegate: MapQuickItem { + coordinate: place.location.coordinate + + anchorPoint.x: image.width * 0.5 + anchorPoint.y: image.height + + sourceItem: Column { + Image { id: image; source: "marker.png" } + Text { text: title; font.bold: true } + } + } + } + } + //! [Places MapItemView] + + Connections { + target: searchModel + function onStatusChanged() { + if (searchModel.status == PlaceSearchModel.Error) + console.log(searchModel.errorString()); + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/doc/src/places_map.qdoc new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/doc/src/places_map.qdoc --- old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/doc/src/places_map.qdoc 2024-02-09 23:39:30.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/doc/src/places_map.qdoc 2024-03-19 02:59:08.000000000 +0100 @@ -21,7 +21,7 @@ To write the QML application that will show places on a map, we start by making the following import declarations. - \snippet places_map/places_map.qml Imports + \snippet places_map/PlacesMap.qml Imports Instantiate a \l Plugin instance. The \l Plugin is effectively the backend from where places are sourced from. Depending on the chosen plugin @@ -29,7 +29,7 @@ \l {Qt Location Open Street Map Plugin}{OSM plugin} is selected which does not have any mandatory parameters. - \snippet places_map/places_map.qml Initialize Plugin + \snippet places_map/PlacesMap.qml Initialize Plugin Next we instantiate a \l PlaceSearchModel which we can use to specify search parameters and perform a places search operation. For illustrative @@ -38,7 +38,7 @@ {PlaceSearchModel::update} {update()} would be invoked in response to a user action such as a button click. - \snippet places_map/places_map.qml PlaceSearchModel + \snippet places_map/PlacesMap.qml PlaceSearchModel The map is displayed by using the \l MapView type and inside we declare the \l MapItemView and supply the search model and a delegate. An inline delegate @@ -48,12 +48,12 @@ other search result types may not have a \e place \l {PlaceSearchModel Roles} {role}. - \snippet places_map/places_map.qml Places MapItemView + \snippet places_map/PlacesMap.qml Places MapItemView Finally, a \c PositionSource is used to reset the map to the curent location and find "food" places in the new area. The position information is updated every 2 minutes and if the new position is more than 500 meters away from the last food search area the place search is retriggered. - \snippet places_map/places_map.qml Current Location + \snippet places_map/PlacesMap.qml Current Location */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/main.cpp new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/main.cpp --- old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/main.cpp 2024-02-09 23:39:30.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/main.cpp 2024-03-19 02:59:08.000000000 +0100 @@ -8,7 +8,7 @@ { QGuiApplication app(argc,argv); QQuickView view; - view.setSource(QUrl(QStringLiteral("qrc:///places_map.qml"))); + view.setSource(QUrl(QStringLiteral("qrc:///Main.qml"))); view.setWidth(360); view.setHeight(640); view.show(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/places_map.qml new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/places_map.qml --- old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/places_map.qml 2024-02-09 23:39:30.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/places_map.qml 1970-01-01 01:00:00.000000000 +0100 @@ -1,85 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -//! [Imports] -import QtQuick -import QtPositioning -import QtLocation -//! [Imports] - -Rectangle { - anchors.fill: parent - - //! [Initialize Plugin] - Plugin { - id: myPlugin - name: "osm" - //specify plugin parameters if necessary - //PluginParameter {...} - //PluginParameter {...} - //... - } - //! [Initialize Plugin] - - //! [Current Location] - PositionSource { - id: positionSource - property variant lastSearchPosition: QtPositioning.coordinate(59.93, 10.76) //Initialized/Fallback to Oslo - active: true - updateInterval: 120000 // 2 mins - onPositionChanged: { - var distance = lastSearchPosition.distanceTo(position.coordinate) - if (distance > 500) { - // 500m from last performed food search - lastSearchPosition = positionSource.position.coordinate - } - } - } - //! [Current Location] - - //! [PlaceSearchModel] - PlaceSearchModel { - id: searchModel - - plugin: myPlugin - - searchTerm: "food" - searchArea: QtPositioning.circle(positionSource.lastSearchPosition, 1000 /* 1 km radius */) - Component.onCompleted: update() - } - //! [PlaceSearchModel] - - //! [Places MapItemView] - MapView { - id: view - anchors.fill: parent - map.plugin: myPlugin; - map.center: positionSource.lastSearchPosition - map.zoomLevel: 13 - - MapItemView { - model: searchModel - parent: view.map - delegate: MapQuickItem { - coordinate: place.location.coordinate - - anchorPoint.x: image.width * 0.5 - anchorPoint.y: image.height - - sourceItem: Column { - Image { id: image; source: "marker.png" } - Text { text: title; font.bold: true } - } - } - } - } - //! [Places MapItemView] - - Connections { - target: searchModel - function onStatusChanged() { - if (searchModel.status == PlaceSearchModel.Error) - console.log(searchModel.errorString()); - } - } -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/places_map.qrc new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/places_map.qrc --- old/qtlocation-everywhere-src-6.6.2/examples/location/places_map/places_map.qrc 2024-02-09 23:39:30.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/examples/location/places_map/places_map.qrc 2024-03-19 02:59:08.000000000 +0100 @@ -1,6 +1,8 @@ <RCC> <qresource prefix="/"> <file>marker.png</file> - <file>places_map.qml</file> + <file>Main.qml</file> + <file>PermissionsScreen.qml</file> + <file>PlacesMap.qml</file> </qresource> </RCC> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlocation-everywhere-src-6.6.2/src/location/doc/src/places.qdoc new/qtlocation-everywhere-src-6.6.3/src/location/doc/src/places.qdoc --- old/qtlocation-everywhere-src-6.6.2/src/location/doc/src/places.qdoc 2024-02-09 23:39:30.000000000 +0100 +++ new/qtlocation-everywhere-src-6.6.3/src/location/doc/src/places.qdoc 2024-03-19 02:59:08.000000000 +0100 @@ -128,7 +128,7 @@ \table \row \li - \snippet places_map/places_map.qml Places MapItemView + \snippet places_map/PlacesMap.qml Places MapItemView \li \inlineimage places_map.png \endtable

1 0

commit qt6-httpserver for openSUSE:Factory
by Source-Sync 28 Mar '24

28 Mar '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-httpserver for openSUSE:Factory checked in at 2024-03-28 13:54:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-httpserver (Old) and /work/SRC/openSUSE:Factory/.qt6-httpserver.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-httpserver" Thu Mar 28 13:54:19 2024 rev:13 rq:1162377 version:6.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-httpserver/qt6-httpserver.changes 2024-02-18 20:24:12.280251949 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-httpserver.new.1905/qt6-httpserver.changes 2024-03-28 14:21:17.032872614 +0100 @@ -1,0 +2,6 @@ +Tue Mar 26 14:25:46 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.6.3: + * https://www.qt.io/blog/qt-6.6.3-released + +------------------------------------------------------------------- Old: ---- qthttpserver-everywhere-src-6.6.2.tar.xz New: ---- qthttpserver-everywhere-src-6.6.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-httpserver.spec ++++++ --- /var/tmp/diff_new_pack.dyzIfp/_old 2024-03-28 14:21:27.445255512 +0100 +++ /var/tmp/diff_new_pack.dyzIfp/_new 2024-03-28 14:21:27.445255512 +0100 @@ -16,7 +16,7 @@ # -%define real_version 6.6.2 +%define real_version 6.6.3 %define short_version 6.6 %define tar_name qthttpserver-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-httpserver%{?pkg_suffix} -Version: 6.6.2 +Version: 6.6.3 Release: 0 Summary: Qt HTTP Server License: GPL-3.0-only ++++++ qthttpserver-everywhere-src-6.6.2.tar.xz -> qthttpserver-everywhere-src-6.6.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qthttpserver-everywhere-src-6.6.2/.cmake.conf new/qthttpserver-everywhere-src-6.6.3/.cmake.conf --- old/qthttpserver-everywhere-src-6.6.2/.cmake.conf 2024-02-10 00:03:40.000000000 +0100 +++ new/qthttpserver-everywhere-src-6.6.3/.cmake.conf 2024-03-19 03:30:54.000000000 +0100 @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.6.2") +set(QT_REPO_MODULE_VERSION "6.6.3") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qthttpserver-everywhere-src-6.6.2/.tag new/qthttpserver-everywhere-src-6.6.3/.tag --- old/qthttpserver-everywhere-src-6.6.2/.tag 2024-02-10 00:03:40.000000000 +0100 +++ new/qthttpserver-everywhere-src-6.6.3/.tag 2024-03-19 03:30:54.000000000 +0100 @@ -1 +1 @@ -7c21c72103f949a01853eaf6d7c84fd05a07cf36 +19d4435d4ef523f4a5c30c6484a2f11739fc3fec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qthttpserver-everywhere-src-6.6.2/dependencies.yaml new/qthttpserver-everywhere-src-6.6.3/dependencies.yaml --- old/qthttpserver-everywhere-src-6.6.2/dependencies.yaml 2024-02-10 00:03:40.000000000 +0100 +++ new/qthttpserver-everywhere-src-6.6.3/dependencies.yaml 2024-03-19 03:30:54.000000000 +0100 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: dec1863c7dc63e5788b0c6c061d36e856a6ae2b2 + ref: afdec885058c92e24604f398a926297222da06f3 required: true ../qtwebsockets: - ref: 084929fa58db3a12a096bc511a298c2caae5c13e + ref: 26db5812958bc8bcf6e333357760c3023631eae3 required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qthttpserver-everywhere-src-6.6.2/src/httpserver/qhttpserverrouterrule.cpp new/qthttpserver-everywhere-src-6.6.3/src/httpserver/qhttpserverrouterrule.cpp --- old/qthttpserver-everywhere-src-6.6.2/src/httpserver/qhttpserverrouterrule.cpp 2024-02-10 00:03:40.000000000 +0100 +++ new/qthttpserver-everywhere-src-6.6.3/src/httpserver/qhttpserverrouterrule.cpp 2024-03-19 03:30:54.000000000 +0100 @@ -2,6 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtHttpServer/qhttpserverrouterrule.h> +#include <QtHttpServer/qhttpserverresponder.h> #include <private/qhttpserverrouterrule_p.h> #include <private/qhttpserverrequest_p.h> @@ -152,7 +153,11 @@ if (!matches(request, &match)) return false; - d->routerHandler(match, request, std::move(responder)); + // Ensure that original responder object is destroyed even if the route + // handler does not explicitly move out of it. The websocket handler code + // assumes this is the case (see also QTBUG-120746). + auto r = std::move(responder); + d->routerHandler(match, request, std::move(r)); return true; }

1 0

commit qt6-connectivity for openSUSE:Factory
by Source-Sync 28 Mar '24

28 Mar '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-connectivity for openSUSE:Factory checked in at 2024-03-28 13:54:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-connectivity (Old) and /work/SRC/openSUSE:Factory/.qt6-connectivity.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-connectivity" Thu Mar 28 13:54:15 2024 rev:21 rq:1162372 version:6.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-connectivity/qt6-connectivity.changes 2024-02-18 20:24:01.139849920 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-connectivity.new.1905/qt6-connectivity.changes 2024-03-28 14:20:33.931287630 +0100 @@ -1,0 +2,6 @@ +Tue Mar 26 14:25:30 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.6.3: + * https://www.qt.io/blog/qt-6.6.3-released + +------------------------------------------------------------------- Old: ---- qtconnectivity-everywhere-src-6.6.2.tar.xz New: ---- qtconnectivity-everywhere-src-6.6.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-connectivity.spec ++++++ --- /var/tmp/diff_new_pack.dJiRhk/_old 2024-03-28 14:20:43.611643608 +0100 +++ /var/tmp/diff_new_pack.dJiRhk/_new 2024-03-28 14:20:43.611643608 +0100 @@ -16,7 +16,7 @@ # -%define real_version 6.6.2 +%define real_version 6.6.3 %define short_version 6.6 %define tar_name qtconnectivity-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-connectivity%{?pkg_suffix} -Version: 6.6.2 +Version: 6.6.3 Release: 0 Summary: Qt 6 connectivity tools and libraries License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) ++++++ qtconnectivity-everywhere-src-6.6.2.tar.xz -> qtconnectivity-everywhere-src-6.6.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-everywhere-src-6.6.2/.cmake.conf new/qtconnectivity-everywhere-src-6.6.3/.cmake.conf --- old/qtconnectivity-everywhere-src-6.6.2/.cmake.conf 2024-02-09 23:03:20.000000000 +0100 +++ new/qtconnectivity-everywhere-src-6.6.3/.cmake.conf 2024-03-19 00:53:16.000000000 +0100 @@ -1,3 +1,3 @@ -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_NO_AS_CONST=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-everywhere-src-6.6.2/.tag new/qtconnectivity-everywhere-src-6.6.3/.tag --- old/qtconnectivity-everywhere-src-6.6.2/.tag 2024-02-09 23:03:20.000000000 +0100 +++ new/qtconnectivity-everywhere-src-6.6.3/.tag 2024-03-19 00:53:16.000000000 +0100 @@ -1 +1 @@ -c29a74616971b451ed2e2d28d98df54ff1272309 +bc8194177c9f11e0082650d83e2b452446d49b7c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-everywhere-src-6.6.2/dependencies.yaml new/qtconnectivity-everywhere-src-6.6.3/dependencies.yaml --- old/qtconnectivity-everywhere-src-6.6.2/dependencies.yaml 2024-02-09 23:03:20.000000000 +0100 +++ new/qtconnectivity-everywhere-src-6.6.3/dependencies.yaml 2024-03-19 00:53:16.000000000 +0100 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: dec1863c7dc63e5788b0c6c061d36e856a6ae2b2 + ref: afdec885058c92e24604f398a926297222da06f3 required: true ../qtdeclarative: - ref: b3d82373ac90e54ad4cbab0c16709a19a9441beb + ref: ab5521fd1a637739c7e91def84caa84426055aff required: false

1 0

commit kwin6 for openSUSE:Factory
by Source-Sync 28 Mar '24

28 Mar '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kwin6 for openSUSE:Factory checked in at 2024-03-28 13:54:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwin6 (Old) and /work/SRC/openSUSE:Factory/.kwin6.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kwin6" Thu Mar 28 13:54:08 2024 rev:3 rq:1163041 version:6.0.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kwin6/kwin6.changes 2024-03-14 17:43:54.050828395 +0100 +++ /work/SRC/openSUSE:Factory/.kwin6.new.1905/kwin6.changes 2024-03-28 14:19:46.413540249 +0100 @@ -1,0 +2,24 @@ +Wed Mar 27 17:49:07 UTC 2024 - Fabian Vogt <fabian(a)ritter-vogt.de> + +- Update to 6.0.3.1: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.0.3.1 +- Changes since 6.0.3: + * plugins/screencast: Handle failing to import dmabuf + * plugins/screencast: Simplify damage calculation in region screen cast source + * plugins/screencast: Drop "stream" in ScreenCastStream::streamReady + * plugins/screencast: Rename ScreenCastStream::stop() to close() + * plugins/screencast: Pause/resume source when stream is paused/resumed + * Fix oversights on shortcut handling within Overview/Grid effect (kde#482931) + * tiles: Evacuate windows in CustomTile::remove() + * tiles: Use deleteLater() in CustomTile::remove() + +------------------------------------------------------------------- +Tue Mar 26 18:05:50 UTC 2024 - Fabian Vogt <fabian(a)ritter-vogt.de> + +- Update to 6.0.3: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.0.3 +- Too many changes to list here + +------------------------------------------------------------------- Old: ---- kwin-6.0.2.tar.xz kwin-6.0.2.tar.xz.sig New: ---- kwin-6.0.3.1.tar.xz kwin-6.0.3.1.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwin6.spec ++++++ --- /var/tmp/diff_new_pack.EgsICz/_old 2024-03-28 14:19:58.685991547 +0100 +++ /var/tmp/diff_new_pack.EgsICz/_new 2024-03-28 14:19:58.689991694 +0100 @@ -29,14 +29,15 @@ %{!?_plasma6_version: %define _plasma6_version %(echo %{_plasma6_bugfix} | awk -F. '{print $1"."$2}')} %bcond_without released Name: kwin6 -Version: 6.0.2 +Version: 6.0.3.1 +%global _plasma6_bugfix 6.0.3 Release: 0 Summary: KDE Window Manager License: GPL-2.0-or-later AND GPL-3.0-or-later URL: https://www.kde.org -Source: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz +Source: https://download.kde.org/stable/plasma/6.0.3/%{rname}-%{version}.tar.xz %if %{with released} -Source1: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.x… +Source1: https://download.kde.org/stable/plasma/6.0.3/%{rname}-%{version}.tar.xz.sig Source2: plasma.keyring %endif BuildRequires: fdupes ++++++ kwin-6.0.2.tar.xz -> kwin-6.0.3.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/kwin6/kwin-6.0.2.tar.xz /work/SRC/openSUSE:Factory/.kwin6.new.1905/kwin-6.0.3.1.tar.xz differ: char 25, line 1

1 0

commit qt6-multimedia for openSUSE:Factory
by Source-Sync 28 Mar '24

28 Mar '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-multimedia for openSUSE:Factory checked in at 2024-03-28 13:54:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-multimedia (Old) and /work/SRC/openSUSE:Factory/.qt6-multimedia.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-multimedia" Thu Mar 28 13:54:07 2024 rev:21 rq:1162889 version:6.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-multimedia/qt6-multimedia.changes 2024-02-18 20:24:21.380580358 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-multimedia.new.1905/qt6-multimedia.changes 2024-03-28 14:19:36.429173090 +0100 @@ -1,0 +2,11 @@ +Wed Mar 27 12:56:08 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Make libQt6Multimedia6 require the qtmultimedia plugins (related: boo#1222064) + +------------------------------------------------------------------- +Tue Mar 26 14:26:06 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.6.3: + * https://www.qt.io/blog/qt-6.6.3-released + +------------------------------------------------------------------- Old: ---- qtmultimedia-everywhere-src-6.6.2.tar.xz New: ---- qtmultimedia-everywhere-src-6.6.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-multimedia.spec ++++++ --- /var/tmp/diff_new_pack.b517Yb/_old 2024-03-28 14:19:45.961523626 +0100 +++ /var/tmp/diff_new_pack.b517Yb/_new 2024-03-28 14:19:45.965523774 +0100 @@ -16,7 +16,7 @@ # -%define real_version 6.6.2 +%define real_version 6.6.3 %define short_version 6.6 %define short_name qtmultimedia %define tar_name qtmultimedia-everywhere-src @@ -28,7 +28,7 @@ %endif # Name: qt6-multimedia%{?pkg_suffix} -Version: 6.6.2 +Version: 6.6.3 Release: 0 Summary: Qt 6 Multimedia libraries License: GPL-3.0-or-later @@ -88,6 +88,7 @@ %package -n libQt6Multimedia6 Summary: Qt 6 Multimedia library +Requires: qt6-multimedia = %{version} %description -n libQt6Multimedia6 The Qt 6 Multimedia library. ++++++ qtmultimedia-everywhere-src-6.6.2.tar.xz -> qtmultimedia-everywhere-src-6.6.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/qt6-multimedia/qtmultimedia-everywhere-src-6.6.2.tar.xz /work/SRC/openSUSE:Factory/.qt6-multimedia.new.1905/qtmultimedia-everywhere-src-6.6.3.tar.xz differ: char 26, line 1

1 0