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-05-27 11:48:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-quick3dphysics (Old) and /work/SRC/openSUSE:Factory/.qt6-quick3dphysics.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-quick3dphysics" Mon May 27 11:48:31 2024 rev:15 rq:1176065 version:6.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-quick3dphysics/qt6-quick3dphysics.changes 2024-04-08 17:51:22.551700998 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-quick3dphysics.new.24587/qt6-quick3dphysics.changes 2024-05-27 11:54:35.907033294 +0200 @@ -1,0 +2,6 @@ +Tue May 21 08:31:40 UTC 2024 - Christophe Marin <christo...@krop.fr> + +- Update to 6.7.1: + * https://www.qt.io/blog/qt-6.7.1-released + +------------------------------------------------------------------- Old: ---- qtquick3dphysics-everywhere-src-6.7.0.tar.xz New: ---- qtquick3dphysics-everywhere-src-6.7.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-quick3dphysics.spec ++++++ --- /var/tmp/diff_new_pack.4i296X/_old 2024-05-27 11:54:38.427125713 +0200 +++ /var/tmp/diff_new_pack.4i296X/_new 2024-05-27 11:54:38.431125860 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.0 +%define real_version 6.7.1 %define short_version 6.7 %define tar_name qtquick3dphysics-everywhere-src %define tar_suffix %{nil} @@ -27,12 +27,12 @@ %endif # Name: qt6-quick3dphysics%{?pkg_suffix} -Version: 6.7.0 +Version: 6.7.1 Release: 0 Summary: Qt 6 Quick3D Physics Extensions License: GPL-3.0-only URL: https://www.qt.io -Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz +Source0: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz BuildRequires: pkgconfig BuildRequires: qt6-core-private-devel BuildRequires: qt6-gui-private-devel ++++++ qtquick3dphysics-everywhere-src-6.7.0.tar.xz -> qtquick3dphysics-everywhere-src-6.7.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/.cmake.conf new/qtquick3dphysics-everywhere-src-6.7.1/.cmake.conf --- old/qtquick3dphysics-everywhere-src-6.7.0/.cmake.conf 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/.cmake.conf 2024-05-09 05:10:14.000000000 +0200 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.7.0") +set(QT_REPO_MODULE_VERSION "6.7.1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_CONTEXTLESS_CONNECT=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/.tag new/qtquick3dphysics-everywhere-src-6.7.1/.tag --- old/qtquick3dphysics-everywhere-src-6.7.0/.tag 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/.tag 2024-05-09 05:10:14.000000000 +0200 @@ -1 +1 @@ -e4ee17465899cb5d7e4f1c7783f043bffc42fe36 +04b018474c9f89d4310925a63a5c720fbf0e2dd1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/dependencies.yaml new/qtquick3dphysics-everywhere-src-6.7.1/dependencies.yaml --- old/qtquick3dphysics-everywhere-src-6.7.0/dependencies.yaml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/dependencies.yaml 2024-05-09 05:10:14.000000000 +0200 @@ -1,13 +1,13 @@ dependencies: ../qtbase: - ref: 98602c26fc97eb41e3dd7548194ca637420a31b9 + ref: c195fe7d33decbd5ddd47ae46dbf8e0d9c20ba85 required: true ../qtdeclarative: - ref: e6d14fcdc95713f65367499629f93fb1f1e35ec9 + ref: 734849e4577b75e85420b08ddb55974482bbd063 required: true ../qtquick3d: - ref: 2f4d3edc8062bac19885a6aec394f335e6e1b5ab + ref: 8c2d9addd9509dec17672b0b94cc636c38215dfc required: true ../qtshadertools: - ref: 65b015f6a272c8f5eb08f1c39aa8065f7e2379ed + ref: 8644496ddbcb2480c3b6cab92022c1216d3f5eaa required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/examples/CMakeLists.txt new/qtquick3dphysics-everywhere-src-6.7.1/examples/CMakeLists.txt --- old/qtquick3dphysics-everywhere-src-6.7.0/examples/CMakeLists.txt 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/examples/CMakeLists.txt 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause qt_examples_build_begin(EXTERNAL_BUILD) add_subdirectory(quick3dphysics) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/examples/quick3dphysics/CMakeLists.txt new/qtquick3dphysics-everywhere-src-6.7.1/examples/quick3dphysics/CMakeLists.txt --- old/qtquick3dphysics-everywhere-src-6.7.0/examples/quick3dphysics/CMakeLists.txt 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/examples/quick3dphysics/CMakeLists.txt 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause qt_internal_add_example(cannon) qt_internal_add_example(charactercontroller) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/examples/quick3dphysics/cannon/CMakeLists.txt new/qtquick3dphysics-everywhere-src-6.7.1/examples/quick3dphysics/cannon/CMakeLists.txt --- old/qtquick3dphysics-everywhere-src-6.7.0/examples/quick3dphysics/cannon/CMakeLists.txt 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/examples/quick3dphysics/cannon/CMakeLists.txt 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.14) project(example_cannon LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/examples/quick3dphysics/charactercontroller/CMakeLists.txt new/qtquick3dphysics-everywhere-src-6.7.1/examples/quick3dphysics/charactercontroller/CMakeLists.txt --- old/qtquick3dphysics-everywhere-src-6.7.0/examples/quick3dphysics/charactercontroller/CMakeLists.txt 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/examples/quick3dphysics/charactercontroller/CMakeLists.txt 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2023 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.14) project(example_charactercontroller LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/examples/quick3dphysics/compoundshapes/CMakeLists.txt new/qtquick3dphysics-everywhere-src-6.7.1/examples/quick3dphysics/compoundshapes/CMakeLists.txt --- old/qtquick3dphysics-everywhere-src-6.7.0/examples/quick3dphysics/compoundshapes/CMakeLists.txt 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/examples/quick3dphysics/compoundshapes/CMakeLists.txt 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.14) project(example_compoundshapes LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/examples/quick3dphysics/customshapes/CMakeLists.txt new/qtquick3dphysics-everywhere-src-6.7.1/examples/quick3dphysics/customshapes/CMakeLists.txt --- old/qtquick3dphysics-everywhere-src-6.7.0/examples/quick3dphysics/customshapes/CMakeLists.txt 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/examples/quick3dphysics/customshapes/CMakeLists.txt 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.14) project(example_customshapes LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/examples/quick3dphysics/impeller/CMakeLists.txt new/qtquick3dphysics-everywhere-src-6.7.1/examples/quick3dphysics/impeller/CMakeLists.txt --- old/qtquick3dphysics-everywhere-src-6.7.0/examples/quick3dphysics/impeller/CMakeLists.txt 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/examples/quick3dphysics/impeller/CMakeLists.txt 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.14) project(example_impeller LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/examples/quick3dphysics/mass/CMakeLists.txt new/qtquick3dphysics-everywhere-src-6.7.1/examples/quick3dphysics/mass/CMakeLists.txt --- old/qtquick3dphysics-everywhere-src-6.7.0/examples/quick3dphysics/mass/CMakeLists.txt 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/examples/quick3dphysics/mass/CMakeLists.txt 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.14) project(example_mass LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/examples/quick3dphysics/material/CMakeLists.txt new/qtquick3dphysics-everywhere-src-6.7.1/examples/quick3dphysics/material/CMakeLists.txt --- old/qtquick3dphysics-everywhere-src-6.7.0/examples/quick3dphysics/material/CMakeLists.txt 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/examples/quick3dphysics/material/CMakeLists.txt 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.14) project(example_material LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/examples/quick3dphysics/simple/CMakeLists.txt new/qtquick3dphysics-everywhere-src-6.7.1/examples/quick3dphysics/simple/CMakeLists.txt --- old/qtquick3dphysics-everywhere-src-6.7.0/examples/quick3dphysics/simple/CMakeLists.txt 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/examples/quick3dphysics/simple/CMakeLists.txt 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.14) project(example_simple LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/licenseRule.json new/qtquick3dphysics-everywhere-src-6.7.1/licenseRule.json --- old/qtquick3dphysics-everywhere-src-6.7.0/licenseRule.json 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/licenseRule.json 2024-05-09 05:10:14.000000000 +0200 @@ -0,0 +1,84 @@ +[ + { + "comment" : ["file_pattern_ending: strings matched against the end of a file name.", + "location keys: regular expression matched against the beginning of", + "the file path (relative to the git submodule root).", + "spdx: list of SPDX-License-Expression's allowed in the matching files.", + "-------------------------------------------------------", + "Files with the following endings are Build System licensed,", + "unless they are examples", + "Files with other endings can also be build system files" + ], + "file_pattern_ending" : ["CMakeLists.txt", ".cmake", ".pro", ".pri", ".prf", + "configure", "configure.bat", "cmake.in", "plist.in", "CMakeLists.txt.in"], + "location" : { + "" : { + "comment" : "Default", + "file type" : "build system", + "spdx" : ["BSD-3-Clause"] + }, + "(.*)(examples/|snippets/)" : { + "comment" : "Example takes precedence", + "file type" : "examples and snippets", + "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + } + } + }, + { + "comments" : ["Files with the following endings are Tool licensed,", + "unless they are examples.", + "Files with other endings can also be tool files."], + "file_pattern_ending" : [".sh", ".py", ".pl", ".bat", ".ps1"], + "location" :{ + "" : { + "comment" : "Default", + "file type" : "tools and utils", + "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"] + }, + "(.*)(examples/|snippets/)" : { + "comment" : "Example takes precedence", + "file type" : "examples and snippets", + "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + } + } + }, + { + "comment" : "Files with the following endings are Documentation licensed.", + "file_pattern_ending" : [".qdoc", ".qdocinc" , ".qdocconf", ".txt", "README", "qt_attribution.json"], + "location" :{ + "" : { + "comment" : "", + "file type" : "documentation", + "spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] + } + } + }, + { + "comment" : ["All other files", + "The licensing is defined only by the file location in the Qt module repository.", + "NO <file_pattern_ending> key for this case!", + "This needs to be the last entry of the file."], + "location" : { + "" : { + "comment" : "Default", + "file type" : "module and plugin", + "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] + }, + "src/" : { + "comment" : "Default", + "file type" : "module and plugin", + "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] + }, + "tests/" : { + "comment" : "Default", + "file type" : "test", + "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] + }, + "(.*)(examples/|snippets/)" : { + "comment" : "Default", + "file type" : "examples and snippets", + "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + } + } + } +] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/src/3rdparty/PhysX/0005-Fix-Uninitialized-Variables.patch new/qtquick3dphysics-everywhere-src-6.7.1/src/3rdparty/PhysX/0005-Fix-Uninitialized-Variables.patch --- old/qtquick3dphysics-everywhere-src-6.7.0/src/3rdparty/PhysX/0005-Fix-Uninitialized-Variables.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/src/3rdparty/PhysX/0005-Fix-Uninitialized-Variables.patch 2024-05-09 05:10:14.000000000 +0200 @@ -0,0 +1,26 @@ +diff --git a/src/3rdparty/PhysX/source/geomutils/src/mesh/GuMidphaseRTree.cpp b/src/3rdparty/PhysX/source/geomutils/src/mesh/GuMidphaseRTree.cpp +index 564a11d..441ebf0 100644 +--- a/src/3rdparty/PhysX/source/geomutils/src/mesh/GuMidphaseRTree.cpp ++++ b/src/3rdparty/PhysX/source/geomutils/src/mesh/GuMidphaseRTree.cpp +@@ -237,7 +237,7 @@ struct RayRTreeCallback : RTree::CallbackRaycast, RTree::Callback + + virtual bool processResults(PxU32 numTouched, PxU32* touched) + { +- PxF32 dummy; ++ PxF32 dummy = 0; + return RayRTreeCallback::processResults(numTouched, touched, dummy); + } + +diff --git a/src/3rdparty/PhysX/source/geomutils/src/pcm/GuPCMTriangleContactGen.cpp b/src/3rdparty/PhysX/source/geomutils/src/pcm/GuPCMTriangleContactGen.cpp +index a18e38f..44bf61e 100644 +--- a/src/3rdparty/PhysX/source/geomutils/src/pcm/GuPCMTriangleContactGen.cpp ++++ b/src/3rdparty/PhysX/source/geomutils/src/pcm/GuPCMTriangleContactGen.cpp +@@ -874,7 +874,7 @@ namespace physx + Vec3V points1In0[3]; + FloatV points1In0TValue[3]; + +- bool points1In0Penetration[3]; ++ bool points1In0Penetration[3] = { false, false, false}; + + //Transform all the verts from vertex space to shape space + map0->populateVerts(inds0, referencePolygon.mNbVerts, polyData0.mVerts, points0In0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/src/3rdparty/PhysX/0005-FixDeadlockStartingThreads.patch new/qtquick3dphysics-everywhere-src-6.7.1/src/3rdparty/PhysX/0005-FixDeadlockStartingThreads.patch --- old/qtquick3dphysics-everywhere-src-6.7.0/src/3rdparty/PhysX/0005-FixDeadlockStartingThreads.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/src/3rdparty/PhysX/0005-FixDeadlockStartingThreads.patch 2024-05-09 05:10:14.000000000 +0200 @@ -0,0 +1,70 @@ +diff --git a/src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp b/src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp +index 9389b4d..0fb6851 100644 +--- a/src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp ++++ b/src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp +@@ -97,8 +97,7 @@ class _ThreadImpl + volatile int32_t state; + + pthread_t thread; +- pid_t tid; +- ++ pid_t tid; // Not used for PX_EMSCRIPTEN + uint32_t affinityMask; + const char* name; + }; +@@ -116,7 +115,7 @@ static void setTid(_ThreadImpl& threadImpl) + #elif PX_APPLE_FAMILY + threadImpl.tid = syscall(SYS_gettid); + #elif PX_EMSCRIPTEN +- threadImpl.tid = pthread_self(); ++ // No thread id for emscripten + #else + threadImpl.tid = syscall(__NR_gettid); + #endif +@@ -128,11 +127,16 @@ static void setTid(_ThreadImpl& threadImpl) + void* PxThreadStart(void* arg) + { + _ThreadImpl* impl = getThread(reinterpret_cast<ThreadImpl*>(arg)); ++#ifndef PX_EMSCRIPTEN + impl->state = _PxThreadStarted; ++#endif + ++#ifdef PX_EMSCRIPTEN ++ while(atomicCompareExchange(&(impl->threadStarted), 1, 1) == 0) ++ sched_yield(); ++#endif + // run setTid in thread's context + setTid(*impl); +- + // then run either the passed in function or execute from the derived class (Runnable). + if(impl->fn) + (*impl->fn)(impl->arg); +@@ -202,7 +206,9 @@ void ThreadImpl::start(uint32_t stackSize, Runnable* runnable) + stackSize = PTHREAD_STACK_MIN; + } + #endif +- ++#ifdef PX_EMSCRIPTEN ++ getThread(this)->state = _PxThreadStarted; ++#endif + if(runnable && !getThread(this)->arg && !getThread(this)->fn) + getThread(this)->arg = runnable; + +@@ -220,10 +226,17 @@ void ThreadImpl::start(uint32_t stackSize, Runnable* runnable) + #endif + PX_ASSERT(!status); + ++#ifdef PX_EMSCRIPTEN ++ // The waiting is reversed, the started thread wait for us to ++ // reach this point. We do this because waiting for the started ++ // thread to signal us might deadlock wasm. ++ atomicCompareExchange(&(getThread(this)->threadStarted), 1, 0); ++#else + // wait for thread to startup and write out TID + // otherwise TID dependent calls like setAffinity will fail. + while(atomicCompareExchange(&(getThread(this)->threadStarted), 1, 1) == 0) + yield(); ++#endif + + // here we are sure that getThread(this)->state >= _PxThreadStarted + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp new/qtquick3dphysics-everywhere-src-6.7.1/src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -97,8 +97,7 @@ volatile int32_t state; pthread_t thread; - pid_t tid; - + pid_t tid; // Not used for PX_EMSCRIPTEN uint32_t affinityMask; const char* name; }; @@ -116,7 +115,7 @@ #elif PX_APPLE_FAMILY threadImpl.tid = syscall(SYS_gettid); #elif PX_EMSCRIPTEN - threadImpl.tid = pthread_self(); + // No thread id for emscripten #else threadImpl.tid = syscall(__NR_gettid); #endif @@ -128,11 +127,16 @@ void* PxThreadStart(void* arg) { _ThreadImpl* impl = getThread(reinterpret_cast<ThreadImpl*>(arg)); +#ifndef PX_EMSCRIPTEN impl->state = _PxThreadStarted; +#endif +#ifdef PX_EMSCRIPTEN + while(atomicCompareExchange(&(impl->threadStarted), 1, 1) == 0) + sched_yield(); +#endif // run setTid in thread's context setTid(*impl); - // then run either the passed in function or execute from the derived class (Runnable). if(impl->fn) (*impl->fn)(impl->arg); @@ -202,7 +206,9 @@ stackSize = PTHREAD_STACK_MIN; } #endif - +#ifdef PX_EMSCRIPTEN + getThread(this)->state = _PxThreadStarted; +#endif if(runnable && !getThread(this)->arg && !getThread(this)->fn) getThread(this)->arg = runnable; @@ -220,10 +226,17 @@ #endif PX_ASSERT(!status); +#ifdef PX_EMSCRIPTEN + // The waiting is reversed, the started thread wait for us to + // reach this point. We do this because waiting for the started + // thread to signal us might deadlock wasm. + atomicCompareExchange(&(getThread(this)->threadStarted), 1, 0); +#else // wait for thread to startup and write out TID // otherwise TID dependent calls like setAffinity will fail. while(atomicCompareExchange(&(getThread(this)->threadStarted), 1, 1) == 0) yield(); +#endif // here we are sure that getThread(this)->state >= _PxThreadStarted diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/src/3rdparty/PhysX/source/geomutils/src/mesh/GuMidphaseRTree.cpp new/qtquick3dphysics-everywhere-src-6.7.1/src/3rdparty/PhysX/source/geomutils/src/mesh/GuMidphaseRTree.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/src/3rdparty/PhysX/source/geomutils/src/mesh/GuMidphaseRTree.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/src/3rdparty/PhysX/source/geomutils/src/mesh/GuMidphaseRTree.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -237,7 +237,7 @@ virtual bool processResults(PxU32 numTouched, PxU32* touched) { - PxF32 dummy; + PxF32 dummy = 0; return RayRTreeCallback::processResults(numTouched, touched, dummy); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/src/3rdparty/PhysX/source/geomutils/src/pcm/GuPCMTriangleContactGen.cpp new/qtquick3dphysics-everywhere-src-6.7.1/src/3rdparty/PhysX/source/geomutils/src/pcm/GuPCMTriangleContactGen.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/src/3rdparty/PhysX/source/geomutils/src/pcm/GuPCMTriangleContactGen.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/src/3rdparty/PhysX/source/geomutils/src/pcm/GuPCMTriangleContactGen.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -874,7 +874,7 @@ Vec3V points1In0[3]; FloatV points1In0TValue[3]; - bool points1In0Penetration[3]; + bool points1In0Penetration[3] = { false, false, false}; //Transform all the verts from vertex space to shape space map0->populateVerts(inds0, referencePolygon.mNbVerts, polyData0.mVerts, points0In0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/src/quick3dphysics/qphysicsworld.cpp new/qtquick3dphysics-everywhere-src-6.7.1/src/quick3dphysics/qphysicsworld.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/src/quick3dphysics/qphysicsworld.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/src/quick3dphysics/qphysicsworld.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -67,6 +67,9 @@ This property enables continuous collision detection. This will reduce the risk of bodies going through other bodies at high velocities (also known as tunnelling). The default value is \c false. + + \warning Using trigger bodies with CCD enabled is not supported and can result in missing or + false trigger reports. */ /*! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/callback/CMakeLists.txt new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/callback/CMakeLists.txt --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/callback/CMakeLists.txt 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/callback/CMakeLists.txt 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2023 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause set(PROJECT_NAME "test_auto_callback") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/callback/PlaneScene.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/callback/PlaneScene.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/callback/PlaneScene.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/callback/PlaneScene.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick import QtQuick3D diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/callback/tst_callback.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/callback/tst_callback.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/callback/tst_callback.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/callback/tst_callback.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtQuickTest/quicktest.h> class tst_callback: public QObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/callback/tst_callback.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/callback/tst_callback.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/callback/tst_callback.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/callback/tst_callback.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // Tests the callback methods. // diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/callback/tst_callback_report.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/callback/tst_callback_report.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/callback/tst_callback_report.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/callback/tst_callback_report.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // Tests the callback methods with different reporting properties set. // 'reportKinematicKinematicCollisions' and 'reportStaticKinematicCollisions' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/callback_create_delete_node/Box.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/callback_create_delete_node/Box.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/callback_create_delete_node/Box.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/callback_create_delete_node/Box.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2024 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick import QtQuick3D diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/callback_create_delete_node/CMakeLists.txt new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/callback_create_delete_node/CMakeLists.txt --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/callback_create_delete_node/CMakeLists.txt 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/callback_create_delete_node/CMakeLists.txt 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2024 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause set(PROJECT_NAME "test_auto_callback_create_delete_node") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/callback_create_delete_node/tst_callback_create_delete_node.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/callback_create_delete_node/tst_callback_create_delete_node.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/callback_create_delete_node/tst_callback_create_delete_node.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/callback_create_delete_node/tst_callback_create_delete_node.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2024 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtQuickTest/quicktest.h> class tst_callback_create_delete_node : public QObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/callback_create_delete_node/tst_callback_create_delete_node.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/callback_create_delete_node/tst_callback_create_delete_node.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/callback_create_delete_node/tst_callback_create_delete_node.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/callback_create_delete_node/tst_callback_create_delete_node.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2024 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // Tests that removing and adding objects with active contact callbacks // does not crash. QTBUG-121033 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/changescene/ImpellerScene.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/changescene/ImpellerScene.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/changescene/ImpellerScene.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/changescene/ImpellerScene.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick import QtQuick3D diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/changescene/tst_changescene.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/changescene/tst_changescene.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/changescene/tst_changescene.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/changescene/tst_changescene.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtQuickTest/quicktest.h> class tst_changescene: public QObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/changescene/tst_changescene.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/changescene/tst_changescene.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/changescene/tst_changescene.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/changescene/tst_changescene.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtCore import QtTest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/character/CMakeLists.txt new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/character/CMakeLists.txt --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/character/CMakeLists.txt 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/character/CMakeLists.txt 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause set(PROJECT_NAME "test_auto_character") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/character/tst_character.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/character/tst_character.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/character/tst_character.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/character/tst_character.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtQuickTest/quicktest.h> class tst_character: public QObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/character/tst_character.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/character/tst_character.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/character/tst_character.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/character/tst_character.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // Tests the character controller with a trigger box and a static body diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/character_remove/CMakeLists.txt new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/character_remove/CMakeLists.txt --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/character_remove/CMakeLists.txt 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/character_remove/CMakeLists.txt 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause set(PROJECT_NAME "test_auto_character_remove") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/character_remove/Character.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/character_remove/Character.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/character_remove/Character.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/character_remove/Character.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick3D import QtQuick3D.Physics diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/character_remove/tst_character_remove.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/character_remove/tst_character_remove.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/character_remove/tst_character_remove.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/character_remove/tst_character_remove.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtQuickTest/quicktest.h> class tst_character_remove: public QObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/character_remove/tst_character_remove.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/character_remove/tst_character_remove.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/character_remove/tst_character_remove.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/character_remove/tst_character_remove.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // Tests adding and removing character controller diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/character_resize/CMakeLists.txt new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/character_resize/CMakeLists.txt --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/character_resize/CMakeLists.txt 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/character_resize/CMakeLists.txt 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2023 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause set(PROJECT_NAME "test_auto_character_resize") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/character_resize/tst_character_resize.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/character_resize/tst_character_resize.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/character_resize/tst_character_resize.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/character_resize/tst_character_resize.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtQuickTest/quicktest.h> class tst_character_resize: public QObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/character_resize/tst_character_resize.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/character_resize/tst_character_resize.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/character_resize/tst_character_resize.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/character_resize/tst_character_resize.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // A scene with a character controller getting resized until it triggers // boxes and can move over an obstacle. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/cooked/CMakeLists.txt new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/cooked/CMakeLists.txt --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/cooked/CMakeLists.txt 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/cooked/CMakeLists.txt 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause set(PROJECT_NAME "test_auto_cooked") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/cooked/data/tst_cooked.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/cooked/data/tst_cooked.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/cooked/data/tst_cooked.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/cooked/data/tst_cooked.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // This test simply loads three cooked meshes and drops a ball on each mesh. // If the balls successfully trigger a collision then the test passes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/cooked/tst_cooked.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/cooked/tst_cooked.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/cooked/tst_cooked.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/cooked/tst_cooked.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtQuickTest/quicktest.h> class tst_cooked: public QObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/enable_disable/tst_enable_disable.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/enable_disable/tst_enable_disable.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/enable_disable/tst_enable_disable.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/enable_disable/tst_enable_disable.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtQuickTest/quicktest.h> class test_enable_disable: public QObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/enable_disable/tst_enable_disable.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/enable_disable/tst_enable_disable.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/enable_disable/tst_enable_disable.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/enable_disable/tst_enable_disable.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtCore import QtTest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/filtering/BoxesScene.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/filtering/BoxesScene.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/filtering/BoxesScene.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/filtering/BoxesScene.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick import QtQuick3D diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/filtering/tst_filtering.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/filtering/tst_filtering.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/filtering/tst_filtering.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/filtering/tst_filtering.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtQuickTest/quicktest.h> class tst_filtering: public QObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/filtering/tst_filtering.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/filtering/tst_filtering.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/filtering/tst_filtering.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/filtering/tst_filtering.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtCore import QtTest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry/examplegeometry.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry/examplegeometry.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry/examplegeometry.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry/examplegeometry.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "examplegeometry.h" #include <QtGui/QVector3D> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry/examplegeometry.h new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry/examplegeometry.h --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry/examplegeometry.h 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry/examplegeometry.h 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef EXAMPLEGEOMETRY_H #define EXAMPLEGEOMETRY_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry/tst_geometry.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry/tst_geometry.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry/tst_geometry.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry/tst_geometry.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtQuickTest/quicktest.h> class tst_geometry: public QObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry/tst_geometry.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry/tst_geometry.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry/tst_geometry.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry/tst_geometry.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick import QtTest import QtQuick3D diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry_readd/examplegeometry.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry_readd/examplegeometry.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry_readd/examplegeometry.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry_readd/examplegeometry.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "examplegeometry.h" #include <QtGui/QVector3D> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry_readd/examplegeometry.h new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry_readd/examplegeometry.h --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry_readd/examplegeometry.h 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry_readd/examplegeometry.h 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef EXAMPLEGEOMETRY_H #define EXAMPLEGEOMETRY_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry_readd/tst_geometry_readd.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry_readd/tst_geometry_readd.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry_readd/tst_geometry_readd.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry_readd/tst_geometry_readd.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtQuickTest/quicktest.h> class tst_geometry_readd: public QObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry_readd/tst_geometry_readd.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry_readd/tst_geometry_readd.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry_readd/tst_geometry_readd.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry_readd/tst_geometry_readd.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick import QtTest import QtQuick3D diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry_source/examplegeometry.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry_source/examplegeometry.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry_source/examplegeometry.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry_source/examplegeometry.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "examplegeometry.h" #include <QtGui/QVector3D> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry_source/examplegeometry.h new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry_source/examplegeometry.h --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry_source/examplegeometry.h 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry_source/examplegeometry.h 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef EXAMPLEGEOMETRY_H #define EXAMPLEGEOMETRY_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry_source/tst_geometry_source.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry_source/tst_geometry_source.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry_source/tst_geometry_source.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry_source/tst_geometry_source.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtQuickTest/quicktest.h> class tst_geometry_source: public QObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry_source/tst_geometry_source.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry_source/tst_geometry_source.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry_source/tst_geometry_source.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry_source/tst_geometry_source.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick import QtTest import QtQuick3D diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry_update/tilegeometry.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry_update/tilegeometry.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry_update/tilegeometry.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry_update/tilegeometry.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2024 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "tilegeometry.h" #include <QtGui/QVector3D> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry_update/tilegeometry.h new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry_update/tilegeometry.h --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry_update/tilegeometry.h 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry_update/tilegeometry.h 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2024 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef TILEGEOMETRY_H #define TILEGEOMETRY_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry_update/tst_geometry_update.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry_update/tst_geometry_update.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry_update/tst_geometry_update.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry_update/tst_geometry_update.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2024 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtQuickTest/quicktest.h> class tst_geometry_update : public QObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry_update/tst_geometry_update.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry_update/tst_geometry_update.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/geometry_update/tst_geometry_update.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/geometry_update/tst_geometry_update.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2024 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick import QtTest import QtQuick3D diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/heightfield/tst_heightfield.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/heightfield/tst_heightfield.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/heightfield/tst_heightfield.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/heightfield/tst_heightfield.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtQuickTest/quicktest.h> class tst_geometry : public QObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/heightfield/tst_heightfield.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/heightfield/tst_heightfield.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/heightfield/tst_heightfield.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/heightfield/tst_heightfield.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick import QtTest import QtQuick3D diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/heightfield_readd/tst_heightfield_readd.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/heightfield_readd/tst_heightfield_readd.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/heightfield_readd/tst_heightfield_readd.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/heightfield_readd/tst_heightfield_readd.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtQuickTest/quicktest.h> class tst_geometry : public QObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/heightfield_readd/tst_heightfield_readd.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/heightfield_readd/tst_heightfield_readd.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/heightfield_readd/tst_heightfield_readd.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/heightfield_readd/tst_heightfield_readd.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick import QtTest import QtQuick3D diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/invalidscene/EmptyView.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/invalidscene/EmptyView.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/invalidscene/EmptyView.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/invalidscene/EmptyView.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick import QtQuick3D diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/invalidscene/ImpellerScene.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/invalidscene/ImpellerScene.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/invalidscene/ImpellerScene.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/invalidscene/ImpellerScene.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick import QtQuick3D diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/invalidscene/tst_invalidscene.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/invalidscene/tst_invalidscene.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/invalidscene/tst_invalidscene.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/invalidscene/tst_invalidscene.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtQuickTest/quicktest.h> class tst_invalidscene: public QObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/invalidscene/tst_invalidscene.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/invalidscene/tst_invalidscene.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/invalidscene/tst_invalidscene.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/invalidscene/tst_invalidscene.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtCore import QtTest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/multiscene/ImpellerScene.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/multiscene/ImpellerScene.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/multiscene/ImpellerScene.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/multiscene/ImpellerScene.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick import QtQuick3D diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/multiscene/tst_multiscene.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/multiscene/tst_multiscene.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/multiscene/tst_multiscene.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/multiscene/tst_multiscene.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtQuickTest/quicktest.h> class tst_multiscene: public QObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/multiscene/tst_multiscene.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/multiscene/tst_multiscene.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/multiscene/tst_multiscene.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/multiscene/tst_multiscene.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtCore import QtTest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/physicsscene/data/TestCube.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/physicsscene/data/TestCube.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/physicsscene/data/TestCube.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/physicsscene/data/TestCube.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick import QtQuick3D diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/physicsscene/data/tst_physicsscene.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/physicsscene/data/tst_physicsscene.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/physicsscene/data/tst_physicsscene.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/physicsscene/data/tst_physicsscene.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtCore import QtTest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/physicsscene/tst_physicsscene.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/physicsscene/tst_physicsscene.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/auto/physicsscene/tst_physicsscene.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/auto/physicsscene/tst_physicsscene.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtQuickTest/quicktest.h> class tst_physicsscene: public QObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/baseline/scenegrabber/main.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/baseline/scenegrabber/main.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/baseline/scenegrabber/main.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/baseline/scenegrabber/main.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtCore/QTimer> #include <QtCore/QDebug> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/baseline/scenegraph/tst_baseline_quick3dphysics.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/baseline/scenegraph/tst_baseline_quick3dphysics.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/baseline/scenegraph/tst_baseline_quick3dphysics.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/baseline/scenegraph/tst_baseline_quick3dphysics.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <qbaselinetest.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/baseline/shared/baselineprotocol.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/baseline/shared/baselineprotocol.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/baseline/shared/baselineprotocol.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/baseline/shared/baselineprotocol.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "baselineprotocol.h" #include <QLibraryInfo> #include <QImage> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/baseline/shared/baselineprotocol.h new/qtquick3dphysics-everywhere-src-6.7.1/tests/baseline/shared/baselineprotocol.h --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/baseline/shared/baselineprotocol.h 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/baseline/shared/baselineprotocol.h 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef BASELINEPROTOCOL_H #define BASELINEPROTOCOL_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/baseline/shared/lookup3.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/baseline/shared/lookup3.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/baseline/shared/lookup3.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/baseline/shared/lookup3.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/baseline/shared/paintcommands.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/baseline/shared/paintcommands.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/baseline/shared/paintcommands.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/baseline/shared/paintcommands.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "paintcommands.h" #include <qdir.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/baseline/shared/paintcommands.h new/qtquick3dphysics-everywhere-src-6.7.1/tests/baseline/shared/paintcommands.h --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/baseline/shared/paintcommands.h 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/baseline/shared/paintcommands.h 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef PAINTCOMMANDS_H #define PAINTCOMMANDS_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/baseline/shared/qbaselinetest.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/baseline/shared/qbaselinetest.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/baseline/shared/qbaselinetest.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/baseline/shared/qbaselinetest.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "qbaselinetest.h" #include "baselineprotocol.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/baseline/shared/qbaselinetest.h new/qtquick3dphysics-everywhere-src-6.7.1/tests/baseline/shared/qbaselinetest.h --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/baseline/shared/qbaselinetest.h 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/baseline/shared/qbaselinetest.h 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef BASELINETEST_H #define BASELINETEST_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/baseline/shared/qwidgetbaselinetest.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/baseline/shared/qwidgetbaselinetest.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/baseline/shared/qwidgetbaselinetest.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/baseline/shared/qwidgetbaselinetest.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "qwidgetbaselinetest.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/baseline/shared/qwidgetbaselinetest.h new/qtquick3dphysics-everywhere-src-6.7.1/tests/baseline/shared/qwidgetbaselinetest.h --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/baseline/shared/qwidgetbaselinetest.h 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/baseline/shared/qwidgetbaselinetest.h 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #pragma once diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/manual/charactercontroller/main.cpp new/qtquick3dphysics-everywhere-src-6.7.1/tests/manual/charactercontroller/main.cpp --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/manual/charactercontroller/main.cpp 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/manual/charactercontroller/main.cpp 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QGuiApplication> #include <QQmlApplicationEngine> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tests/manual/charactercontroller/main.qml new/qtquick3dphysics-everywhere-src-6.7.1/tests/manual/charactercontroller/main.qml --- old/qtquick3dphysics-everywhere-src-6.7.0/tests/manual/charactercontroller/main.qml 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tests/manual/charactercontroller/main.qml 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick import QtQuick3D diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tools/CMakeLists.txt new/qtquick3dphysics-everywhere-src-6.7.1/tools/CMakeLists.txt --- old/qtquick3dphysics-everywhere-src-6.7.0/tools/CMakeLists.txt 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tools/CMakeLists.txt 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause if(NOT WASM AND NOT IOS AND NOT ANDROID AND NOT QNX AND NOT INTEGRITY AND NOT WEBOS) add_subdirectory(cooker) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquick3dphysics-everywhere-src-6.7.0/tools/cooker/CMakeLists.txt new/qtquick3dphysics-everywhere-src-6.7.1/tools/cooker/CMakeLists.txt --- old/qtquick3dphysics-everywhere-src-6.7.0/tools/cooker/CMakeLists.txt 2024-03-22 21:54:47.000000000 +0100 +++ new/qtquick3dphysics-everywhere-src-6.7.1/tools/cooker/CMakeLists.txt 2024-05-09 05:10:14.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause set(target_name cooker) qt_internal_add_app(${target_name}
