From 08140439121cfa979436a5531b094feb22f525a4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 29 Nov 2022 06:51:27 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3d Change-Id: Ia2ba8c3b480baec895e4a8ec7af0ad59d172a270 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index f11ad1efe..1cdf556af 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: bfb87f1940ce7ee980db83876bd37a98d4820382 + ref: 2b54eb699a8cee6b0e3ea0bce90cf61d1f5cb92b required: true ../tqtc-qtdeclarative: - ref: 69fa64eb2417771e062bbebd399e43b735c2617b + ref: e2181524ffdc80f7c2da45c6408182ee7649ccf8 required: false ../tqtc-qtshadertools: - ref: e7ed9b8c02da906534f79d303466adb2f46d2e12 + ref: 6f3a0bf1ecb6476954556c7f52b3de4b32609e5e required: false -- cgit v1.2.3 From 91e7e58d63f3f8fe793e8e579b9b735126c190ec Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 5 Dec 2022 21:37:54 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3d Change-Id: I77e20e550c829492592855af3378ad66ff5412da Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 1cdf556af..d4e470a6f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: 2b54eb699a8cee6b0e3ea0bce90cf61d1f5cb92b + ref: b76baec7e675abc7ccaf910900acd74f231d0edb required: true ../tqtc-qtdeclarative: - ref: e2181524ffdc80f7c2da45c6408182ee7649ccf8 + ref: 2d698f4ccf303777bfd777f9b20ccad2f8bd932f required: false ../tqtc-qtshadertools: - ref: 6f3a0bf1ecb6476954556c7f52b3de4b32609e5e + ref: f8abf621b97f54a621fd68012a83af1702ce25c3 required: false -- cgit v1.2.3 From 2141eba8d56af7b14cf4d02c4f581feb1a8b72ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Tue, 6 Dec 2022 10:54:09 +0100 Subject: Doc: Fix paths for Files property in qt_attribution.json files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qtattributionsscanner expects file paths to be separated by a space. Change-Id: I983870ea403983f2fc32bf0d986e76235d74e497 Reviewed-by: Jörg Bornemann (cherry picked from commit f3f55a6aa8697c62a154e6331dea970a9ea37cc3) Reviewed-by: Qt Cherry-pick Bot --- src/3rdparty/imgui/qt_attribution.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/imgui/qt_attribution.json b/src/3rdparty/imgui/qt_attribution.json index c5599b70e..a42f91b37 100644 --- a/src/3rdparty/imgui/qt_attribution.json +++ b/src/3rdparty/imgui/qt_attribution.json @@ -33,7 +33,7 @@ "QDocModule": "qt3d", "Description": "Single-file public domain (or MIT licensed) libraries for C/C++", "QtUsage": "Used in tests to demonstrate and verify the integration of an external GUI library.", - "Files": "imstb_rectpack.h,imstb_textedit.h,imstb_truetype.h", + "Files": "imstb_rectpack.h imstb_textedit.h imstb_truetype.h", "Homepage": "https://github.com/nothings/stb/", "License": "MIT License or Public Domain", -- cgit v1.2.3 From 890a9d85ff7037d740d2b4adf8c9fb647f537bbb Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 7 Dec 2022 12:36:36 +0100 Subject: cmake: make qt3d-vulkan feature depends on vulkan in QtGui Fixes: QTBUG-109203 Change-Id: Ib707a6d09cf95e9eb819205660bb185fba398705 Reviewed-by: Alexandru Croitor (cherry picked from commit d270d8639db178219e2649625526c967b3e451d6) Reviewed-by: Qt Cherry-pick Bot --- src/render/configure.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/render/configure.cmake b/src/render/configure.cmake index 9fb7183d9..ffa34c1f4 100644 --- a/src/render/configure.cmake +++ b/src/render/configure.cmake @@ -29,7 +29,7 @@ qt_feature("qt3d-rhi-renderer" PUBLIC ) qt_feature("qt3d-vulkan" PUBLIC LABEL "Vulkan" - CONDITION Vulkan_FOUND AND QT_FEATURE_qt3d_rhi_renderer + CONDITION Vulkan_FOUND AND QT_FEATURE_qt3d_rhi_renderer AND QT_FEATURE_vulkan ) qt_configure_add_summary_section(NAME "Qt 3D APIs") qt_configure_add_summary_entry(ARGS "qt3d-vulkan") -- cgit v1.2.3 From 28f84998d068f65a3d35cf4e14ad44c0f2fac638 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Wed, 7 Dec 2022 16:55:09 +0200 Subject: Bump version to 6.2.8 Change-Id: Idbb6900e9f5e4b9dae24ed555f6cafa57b35e338 Reviewed-by: Tarja Sundqvist --- .cmake.conf | 2 +- .qmake.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cmake.conf b/.cmake.conf index 07d90b8ad..e62fae5ef 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.2.7") +set(QT_REPO_MODULE_VERSION "6.2.8") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "") diff --git a/.qmake.conf b/.qmake.conf index c067d2331..0f4b9bb42 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -6,4 +6,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH DEFINES += QT_NO_JAVA_STYLE_ITERATORS -MODULE_VERSION = 6.2.7 +MODULE_VERSION = 6.2.8 -- cgit v1.2.3 From 30ad093b54fa553886de7a4e92dc1bb3dd2e685d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 11 Dec 2022 21:02:53 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3d Change-Id: I211862ae9096b423c263b342efd39319f6f27fe6 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index d4e470a6f..71cb19152 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: b76baec7e675abc7ccaf910900acd74f231d0edb + ref: 6aa01cf2fbbc713aa2640e54edb93af5ef18605e required: true ../tqtc-qtdeclarative: - ref: 2d698f4ccf303777bfd777f9b20ccad2f8bd932f + ref: d0c4361d43b27311d5f64e1160027fd115799f62 required: false ../tqtc-qtshadertools: - ref: f8abf621b97f54a621fd68012a83af1702ce25c3 + ref: 9d197656962458f1b7dfe0ddd996bc74ce739fae required: false -- cgit v1.2.3 From 784c226ff8b6d0504e20e7aad5d02ce2309e43d3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 15 Dec 2022 07:15:46 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3d Change-Id: I74c38f181d7b2b7244605f7a29dffe59392e1bdf Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 71cb19152..f8ee2cd2f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: 6aa01cf2fbbc713aa2640e54edb93af5ef18605e + ref: ff523a0e3edafa927c9d13e605d0b007e4fc3a16 required: true ../tqtc-qtdeclarative: - ref: d0c4361d43b27311d5f64e1160027fd115799f62 + ref: 0cd389251201abb6b762e288b9929dfff9464f79 required: false ../tqtc-qtshadertools: - ref: 9d197656962458f1b7dfe0ddd996bc74ce739fae + ref: 7aa480163b4fa66fa03b11fa1b5615399bd93f1e required: false -- cgit v1.2.3 From f2e5f9df6d774e7cddf6870a9547cbc5c6fdf0bf Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 15 Dec 2022 07:43:06 +0100 Subject: tst_filtercompatibletechniquejob: fix signed/unsigned mismatch Amends 914752257634dede18cc5079f2a506b699744058. Change-Id: I0320fb3b5e44e10e6ee106bbcb79322323cc3d12 Reviewed-by: Mike Krus (cherry picked from commit cc81a2f1c2cb5d4c1da4a03d8fde90230584edd1) Reviewed-by: Qt Cherry-pick Bot --- .../filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp b/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp index 3a4d5f021..3cc4b3822 100644 --- a/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp +++ b/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp @@ -248,7 +248,7 @@ private Q_SLOTS: // THEN -> empty if job ran properly const std::vector dirtyTechniquesId = testAspect.nodeManagers()->techniqueManager()->takeDirtyTechniques(); - QCOMPARE(dirtyTechniquesId.size(), 0); + QCOMPARE(dirtyTechniquesId.size(), 0U); // Check at least one technique is valid bool foundValid = false; -- cgit v1.2.3 From 86333839ea2191efa4e404524e18c53deba92d67 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 15 Dec 2022 07:43:06 +0100 Subject: tst_renderviews: fix signed/unsigned mismatch Amends f672753556cf28d44f864457dc6338a55e2e0ed4. Change-Id: I5c3e99a033cead91a03ab468b4c44b687422baac Reviewed-by: Mike Krus (cherry picked from commit dfcd9f8b5aa56973e4a000331e51c4e9386ec78d) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/render/opengl/renderviews/tst_renderviews.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/auto/render/opengl/renderviews/tst_renderviews.cpp b/tests/auto/render/opengl/renderviews/tst_renderviews.cpp index d3751e1a7..70d1305ac 100644 --- a/tests/auto/render/opengl/renderviews/tst_renderviews.cpp +++ b/tests/auto/render/opengl/renderviews/tst_renderviews.cpp @@ -309,7 +309,7 @@ private Q_SLOTS: pack.setUniformBuffer(ubo2); // THEN - QCOMPARE(pack.uniformBuffers().size(), 1); + QCOMPARE(pack.uniformBuffers().size(), 1U); QCOMPARE(pack.uniformBuffers().front().m_blockIndex, 1); QCOMPARE(pack.uniformBuffers().front().m_bufferID, nodeId2); @@ -318,7 +318,7 @@ private Q_SLOTS: pack.setUniformBuffer(ubo3); // THEN - QCOMPARE(pack.uniformBuffers().size(), 2); + QCOMPARE(pack.uniformBuffers().size(), 2U); QCOMPARE(pack.uniformBuffers().front().m_blockIndex, 1); QCOMPARE(pack.uniformBuffers().front().m_bufferID, nodeId2); QCOMPARE(pack.uniformBuffers().back().m_blockIndex, 2); @@ -340,7 +340,7 @@ private Q_SLOTS: pack.setShaderStorageBuffer(ssbo2); // THEN - QCOMPARE(pack.shaderStorageBuffers().size(), 1); + QCOMPARE(pack.shaderStorageBuffers().size(), 1U); QCOMPARE(pack.shaderStorageBuffers().front().m_blockIndex, 1); QCOMPARE(pack.shaderStorageBuffers().front().m_bufferID, nodeId2); @@ -349,7 +349,7 @@ private Q_SLOTS: pack.setShaderStorageBuffer(ssbo3); // THEN - QCOMPARE(pack.shaderStorageBuffers().size(), 2); + QCOMPARE(pack.shaderStorageBuffers().size(), 2U); QCOMPARE(pack.shaderStorageBuffers().front().m_blockIndex, 1); QCOMPARE(pack.shaderStorageBuffers().front().m_bufferID, nodeId2); QCOMPARE(pack.shaderStorageBuffers().back().m_blockIndex, 2); -- cgit v1.2.3 From bd67ea5dba4181dbfc830151b204cc27ed4a4805 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 15 Dec 2022 07:43:06 +0100 Subject: tst_pickboundingvolumejob: fix signed/unsigned mismatch Amends fd7536a6e4cfaee8e52c9c6411601aed745fe5f6. Change-Id: Ib2aed78b798ea163125593319f65b123bcc4f895 Reviewed-by: Mike Krus (cherry picked from commit 90fb8a94b438d9aed27b8cf5f020b92891cce749) --- tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp index df0eab407..a9e1f4fc1 100644 --- a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp +++ b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp @@ -2258,7 +2258,7 @@ private Q_SLOTS: std::vector results = gatherer.gather(test->frameGraphRoot()); // THEN - QCOMPARE(results.size(), 0); + QCOMPARE(results.size(), 0U); // WHEN Qt3DRender::Render::FrameGraphNode *backendFGNode = test->nodeManagers()->frameGraphManager()->lookupNode(noPicking->id()); @@ -2274,7 +2274,7 @@ private Q_SLOTS: results = gatherer.gather(test->frameGraphRoot()); // THEN - QCOMPARE(results.size(), 1); + QCOMPARE(results.size(), 1U); auto vca = results.front(); QCOMPARE(vca.area, QSize(600, 600)); QCOMPARE(vca.cameraId, camera->id()); -- cgit v1.2.3 From b9fefbceb6ca64e50713920d29c1f4345cb7b5fe Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 20 Dec 2022 07:14:06 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3d Change-Id: I94b8bbd94f7ead3d72f6baeff4a48844f9e51753 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index f8ee2cd2f..0138a2908 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: ff523a0e3edafa927c9d13e605d0b007e4fc3a16 + ref: 366bc6cd08e09bcd9fac78b6efc839f641669834 required: true ../tqtc-qtdeclarative: - ref: 0cd389251201abb6b762e288b9929dfff9464f79 + ref: 7e7f24a8b7c7ce12d35312480c09cbe404dbfe8b required: false ../tqtc-qtshadertools: - ref: 7aa480163b4fa66fa03b11fa1b5615399bd93f1e + ref: e56655f7ba742254058a6c3289ae80c8e2e91f64 required: false -- cgit v1.2.3 From fe2a69654b2f9ca14d48fdbef26390d8e1707e05 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 23 Dec 2022 07:00:42 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3d Change-Id: Id546fbcf5756dae0a0dbfcf6e48543a3840fcbb7 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 0138a2908..c3b98d7f8 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: 366bc6cd08e09bcd9fac78b6efc839f641669834 + ref: c381d4b124b6dd8bb800402817750436cba06ee9 required: true ../tqtc-qtdeclarative: - ref: 7e7f24a8b7c7ce12d35312480c09cbe404dbfe8b + ref: 10095014d175dae1843a5833d4499e880387f843 required: false ../tqtc-qtshadertools: - ref: e56655f7ba742254058a6c3289ae80c8e2e91f64 + ref: 7e625c5fa859c90d53460f8beeec44de984c4a37 required: false -- cgit v1.2.3 From 4c46f3820bb5e998000d29f1a111120b54d22021 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 28 Dec 2022 06:58:47 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3d Change-Id: I429c139ffa6135888f6a6c2b520381bf8c397d7d Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index c3b98d7f8..ee02de1b7 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: c381d4b124b6dd8bb800402817750436cba06ee9 + ref: 51159e144cf83c8ac7decbc270c091d8a717fd53 required: true ../tqtc-qtdeclarative: - ref: 10095014d175dae1843a5833d4499e880387f843 + ref: 38e2430391ea64b1de7f9f083c5958a3fbd6d012 required: false ../tqtc-qtshadertools: - ref: 7e625c5fa859c90d53460f8beeec44de984c4a37 + ref: 210f6c012e7b85393546d5107674b82fe57d4363 required: false -- cgit v1.2.3 From 20ce644bf1ed3cb9f7fe191d98309483c127235d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 3 Jan 2023 15:11:15 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3d Change-Id: I377c0a97c3c844de855b2fc1ee5c5d0874daeb16 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index ee02de1b7..e603bfeb4 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: 51159e144cf83c8ac7decbc270c091d8a717fd53 + ref: 922089759d6b761e07d71a5f30991bb971d7fea0 required: true ../tqtc-qtdeclarative: - ref: 38e2430391ea64b1de7f9f083c5958a3fbd6d012 + ref: f3a153c361c1c5ac0ade8a84bd513f5dbe0eac50 required: false ../tqtc-qtshadertools: - ref: 210f6c012e7b85393546d5107674b82fe57d4363 + ref: c0180933d31a7e1ac7ad8620952347aaa345d516 required: false -- cgit v1.2.3 From ae3fee7cb991c116c4401673e4d7c3ea425db532 Mon Sep 17 00:00:00 2001 From: Inho Lee Date: Thu, 5 Jan 2023 23:56:11 +0100 Subject: Fix the input qualifier of the fragment shader for GLSL1.10 FS's input qualifier is different with VS's in GLSL1.10. If prototypes has 'headerSnippetsFrag', it will be applied for FS instead of 'headerSnippets'. Fixes: QTBUG-99019 Change-Id: I588d3f78d4ba895a9a90b20a87b92a6da9ffee18 Reviewed-by: Janne Koskinen Reviewed-by: Paul Lemire (cherry picked from commit d6a9ed5039ef4f1f836f5786998485ee6016b315) Reviewed-by: Qt Cherry-pick Bot --- src/render/materialsystem/prototypes/default.json | 3 +++ src/render/shadergraph/qshadernodesloader.cpp | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/render/materialsystem/prototypes/default.json b/src/render/materialsystem/prototypes/default.json index 16a3288ac..f92172d5d 100644 --- a/src/render/materialsystem/prototypes/default.json +++ b/src/render/materialsystem/prototypes/default.json @@ -21,6 +21,9 @@ "headerSnippets": [ "attribute highp $type $name;" ], + "headerSnippetsFrag": [ + "varying highp $type $name;" + ], "substitution": "highp $type $value = $name;" }, { diff --git a/src/render/shadergraph/qshadernodesloader.cpp b/src/render/shadergraph/qshadernodesloader.cpp index 60ff3d499..b9ac31901 100644 --- a/src/render/shadergraph/qshadernodesloader.cpp +++ b/src/render/shadergraph/qshadernodesloader.cpp @@ -280,7 +280,13 @@ void QShaderNodesLoader::load(const QJsonObject &prototypesObject) const QByteArray substitution = substitutionValue.toString().toUtf8(); - const QJsonValue snippetsValue = ruleObject.value(QStringLiteral("headerSnippets")); + // WA for QTBUG-99019 + const auto wIt = (format.shaderType() == QShaderFormat::Fragment) + ? ruleObject.constFind(QStringLiteral("headerSnippetsFrag")) + : ruleObject.constEnd(); + const QJsonValue snippetsValue = (wIt != ruleObject.constEnd()) + ? *wIt + : ruleObject.value(QStringLiteral("headerSnippets")); const QJsonArray snippetsArray = snippetsValue.toArray(); auto snippets = QByteArrayList(); std::transform(snippetsArray.constBegin(), snippetsArray.constEnd(), -- cgit v1.2.3 From 7c7372b2be185d2ed5ddf47d40509820df9c750f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 18 Jan 2023 01:41:22 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3d Change-Id: I4590c3d785f4856cd6b75ccd4851a073e6c88aa7 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index e603bfeb4..dbc1860e9 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: 922089759d6b761e07d71a5f30991bb971d7fea0 + ref: 3eb6b13c0b30263c6c4d17e1b8c4e5a2cbc73b9e required: true ../tqtc-qtdeclarative: - ref: f3a153c361c1c5ac0ade8a84bd513f5dbe0eac50 + ref: 0a01bd32762f240d44230cebfc8b0913de57f49a required: false ../tqtc-qtshadertools: - ref: c0180933d31a7e1ac7ad8620952347aaa345d516 + ref: d37add0564d0f358675da2ad39f0e5db2b071424 required: false -- cgit v1.2.3 From b9a150377658a5825a1a1dbb546a5093b26a7c6c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 26 Jan 2023 14:09:18 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3d Change-Id: I4c4782b4a75cb72ad32afcbea266813380d8a772 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index dbc1860e9..44a8da1c4 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -3,7 +3,7 @@ dependencies: ref: 3eb6b13c0b30263c6c4d17e1b8c4e5a2cbc73b9e required: true ../tqtc-qtdeclarative: - ref: 0a01bd32762f240d44230cebfc8b0913de57f49a + ref: a6b0fa3945144171e656f62eeb9d5e4aa7bc9a11 required: false ../tqtc-qtshadertools: ref: d37add0564d0f358675da2ad39f0e5db2b071424 -- cgit v1.2.3 From 50a4785a0d4fee01cf985968e766ec520ac72eab Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 20 Jan 2023 07:37:20 +0100 Subject: tst_QAspectJob: fix -Wsign-compare std::vector::size_type is unsigned, while decltype(2) is signed. Found by Clang 15: qtestcase.h:585:34: warning: comparison of integers of different signs: 'const unsigned long' and 'const int' [-Wsign-compare] return compare_helper(t1 == t2, "Compared values are not the same", ~~ ^ ~~ tst_qaspectjob.cpp:36:9: note: in instantiation of function template specialization 'QTest::qCompare' requested here QCOMPARE(job1->dependencies().size(), 2); ^ Make the RHS unsigned, too. Amends b70f7af20550f55e9546ff5a2192f53d6ccb62cb. Change-Id: Ia7e612de97de86946c42c104081957fbdcc67d7f Reviewed-by: Paul Lemire (cherry picked from commit 0a06c7d2f465d071b4b4430fe06a080da990143e) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/core/qaspectjob/tst_qaspectjob.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/core/qaspectjob/tst_qaspectjob.cpp b/tests/auto/core/qaspectjob/tst_qaspectjob.cpp index 43c511100..5f44b0b55 100644 --- a/tests/auto/core/qaspectjob/tst_qaspectjob.cpp +++ b/tests/auto/core/qaspectjob/tst_qaspectjob.cpp @@ -79,7 +79,7 @@ private Q_SLOTS: job1->removeDependency(job2); // THEN - QCOMPARE(job1->dependencies().size(), 1); + QCOMPARE(job1->dependencies().size(), 1U); QCOMPARE(job1->dependencies().at(0).lock(), job3); } @@ -98,7 +98,7 @@ private Q_SLOTS: job1->removeDependency(QWeakPointer()); // THEN - QCOMPARE(job1->dependencies().size(), 1); + QCOMPARE(job1->dependencies().size(), 1U); QCOMPARE(job1->dependencies().at(0).lock(), job3); } }; -- cgit v1.2.3 From bb1d7f8f2779118b9d5da06b1a9a8b28c808d381 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 31 Jan 2023 21:31:54 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3d Change-Id: Iaa362823f6687f56689a85a69f089e2b0aa08f7c Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 44a8da1c4..42e852a7d 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: 3eb6b13c0b30263c6c4d17e1b8c4e5a2cbc73b9e + ref: b722b25100808319215cb9e875e622242b42695d required: true ../tqtc-qtdeclarative: - ref: a6b0fa3945144171e656f62eeb9d5e4aa7bc9a11 + ref: d5b6f586f490414df87d5b65ab1a441e211a8972 required: false ../tqtc-qtshadertools: - ref: d37add0564d0f358675da2ad39f0e5db2b071424 + ref: 65db3f87aa82ca6aa5174091a58e64ba68222541 required: false -- cgit v1.2.3 From 4ed8c84d6bf2dc6524e59ee293fd844007ce57a2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 3 Feb 2023 07:11:25 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3d Change-Id: I8d7bd0e81ba7a927aa5a77a57aed125ea443d52c Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 42e852a7d..eb84887b0 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: b722b25100808319215cb9e875e622242b42695d + ref: 4c7176aeb4d759ef408d4a59a0a7f82295bfb41c required: true ../tqtc-qtdeclarative: - ref: d5b6f586f490414df87d5b65ab1a441e211a8972 + ref: 6ceabf0467f852666deb2e02533fe7687ffaef50 required: false ../tqtc-qtshadertools: - ref: 65db3f87aa82ca6aa5174091a58e64ba68222541 + ref: 96bdb62ef8e747560bfb16a2cde7ae4d7d48b070 required: false -- cgit v1.2.3 From 8e0097c0086cae2dde44a0f513ed1cd5b999cbec Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 7 Feb 2023 16:07:15 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3d Change-Id: I807436ac4041069b4a3a23e448d6cd26f4097533 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index eb84887b0..018ff2f6f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: 4c7176aeb4d759ef408d4a59a0a7f82295bfb41c + ref: 980a3f3c82cfcb2bec78fb3b0b6095a63b64784f required: true ../tqtc-qtdeclarative: - ref: 6ceabf0467f852666deb2e02533fe7687ffaef50 + ref: e5cfb56022281e38673b8910915a89395980c449 required: false ../tqtc-qtshadertools: - ref: 96bdb62ef8e747560bfb16a2cde7ae4d7d48b070 + ref: 3a57b72969ee4b146df9a46d491c550bb5993aac required: false -- cgit v1.2.3 From 80477cdaad4dd259accc978de198dd711bf427bb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 10 Feb 2023 06:43:27 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3d Change-Id: I525817e61e9de65003a4525d43b97c369e265116 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 018ff2f6f..e778224f5 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: 980a3f3c82cfcb2bec78fb3b0b6095a63b64784f + ref: a9962aaaba87eb1344c0eb9cbfc944c8882473c2 required: true ../tqtc-qtdeclarative: - ref: e5cfb56022281e38673b8910915a89395980c449 + ref: 176e6eb8357535d19d3ca079c71b96915c1bef9c required: false ../tqtc-qtshadertools: - ref: 3a57b72969ee4b146df9a46d491c550bb5993aac + ref: ee12250010aebd59ff0f6e95fa103b2186250975 required: false -- cgit v1.2.3 From 1a6f04b50ca7153acaa31fe6e53096824ba285d5 Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Mon, 13 Feb 2023 07:46:07 +0100 Subject: QDistanceFieldCache: fix QTextureAtlas dangling pointer Note: already merged in 5.15 Change-Id: If968714f1ca4869e9c607224b537e355b4a6f0dd Reviewed-by: Qt CI Bot Reviewed-by: Paul Lemire (cherry picked from commit b7e398620a5b467e5205722da5314938d1430f8e) Reviewed-by: Qt Cherry-pick Bot --- src/extras/text/qdistancefieldglyphcache.cpp | 10 ++++++++-- tests/auto/extras/qtext2dentity/tst_qtext2dentity.cpp | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/extras/text/qdistancefieldglyphcache.cpp b/src/extras/text/qdistancefieldglyphcache.cpp index d7a2f2099..c848d717e 100644 --- a/src/extras/text/qdistancefieldglyphcache.cpp +++ b/src/extras/text/qdistancefieldglyphcache.cpp @@ -198,13 +198,14 @@ StoredGlyph DistanceFieldFont::refGlyph(quint32 glyph) // scenarios const int size = m_doubleGlyphResolution ? 512 : 256; - QTextureAtlas *atlas = new QTextureAtlas(m_parentNode); + QTextureAtlas *atlas = new QTextureAtlas(); atlas->setWidth(size); atlas->setHeight(size); atlas->setFormat(Qt3DRender::QAbstractTexture::R8_UNorm); atlas->setPixelFormat(QOpenGLTexture::Red); atlas->setMinificationFilter(Qt3DRender::QAbstractTexture::Linear); atlas->setMagnificationFilter(Qt3DRender::QAbstractTexture::Linear); + atlas->setParent(m_parentNode); m_atlasses << atlas; if (!storedGlyph.addToTextureAtlas(atlas)) @@ -237,7 +238,12 @@ void DistanceFieldFont::derefGlyph(quint32 glyph) Q_ASSERT(m_atlasses.contains(atlas)); m_atlasses.removeAll(atlas); - delete atlas; + + // This function might have been called as a result of destroying + // the scene root which traverses the entire scene tree. Calling + // delete on the atlas here could lead to dangling pointers in the + // least of children being traversed for destruction. + atlas->deleteLater(); } m_glyphs.erase(it); diff --git a/tests/auto/extras/qtext2dentity/tst_qtext2dentity.cpp b/tests/auto/extras/qtext2dentity/tst_qtext2dentity.cpp index 08da931fc..5904eaac9 100644 --- a/tests/auto/extras/qtext2dentity/tst_qtext2dentity.cpp +++ b/tests/auto/extras/qtext2dentity/tst_qtext2dentity.cpp @@ -89,7 +89,7 @@ void tst_qtext2dentity::checkChangeArbiter() auto atlases = lookupNodeByClassName(rootEntity.data(), "Qt3DExtras::QTextureAtlas"); QVERIFY(atlases.length() == 1); auto atlas = atlases[0]; - QTRY_VERIFY(Qt3DCore::QNodePrivate::get(atlas)->m_changeArbiter); + QVERIFY(Qt3DCore::QNodePrivate::get(atlas)->m_changeArbiter); } QTEST_MAIN(tst_qtext2dentity) -- cgit v1.2.3 From 6d23994c085417788905eeff431a40d5cf86ceb3 Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Fri, 10 Feb 2023 09:47:50 +0100 Subject: QText2DEntity: fix QTextureAtlas parenting that could lead to crashes We rely on a DistanceFieldFont object to manage QTextureAtlas that hold the glyphs. The DistanceFieldFont/QTextureAtlas are supposed to be parented by the scene root to ensure that a QTextureAtlas lives as long as possible. DistanceFieldFont/QTextureAtlas are stored in a cache global to the scene to minimize the use of resources. When adding text elements, we can reuse atlases since the cache is global to the scene and only destroy an atlas (and remove it from the cache) when we know no more glyphs are referencing it. However we were mistakenly passing a null parenty to DistanceFieldFont instace of the scene root. This resulted on the QTextureAtlas not being parented by the scene root but rather by the first DistanceFieldRenderer to use the atlas. This meants that if the DistanceFieldRenderer were to be destroyed, so would the atlas (yet it would still be referenced by the glyph cache leading to crashes). Change-Id: Id84f6a651b162a4bb3c571b11388fd2429b231de Reviewed-by: Mike Krus (cherry picked from commit b1a135c547f38db0b2ce6b7bc4c4cccc43ef87d3) Reviewed-by: Qt Cherry-pick Bot Reviewed-by: Paul Lemire --- src/extras/text/qdistancefieldglyphcache.cpp | 13 +++++++------ src/extras/text/qtext2dentity.cpp | 3 ++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/extras/text/qdistancefieldglyphcache.cpp b/src/extras/text/qdistancefieldglyphcache.cpp index c848d717e..341a057d1 100644 --- a/src/extras/text/qdistancefieldglyphcache.cpp +++ b/src/extras/text/qdistancefieldglyphcache.cpp @@ -162,6 +162,7 @@ DistanceFieldFont::DistanceFieldFont(const QRawFont &font, bool doubleRes, Qt3DC , m_doubleGlyphResolution(doubleRes) , m_parentNode(parent) { + Q_ASSERT(m_parentNode); } DistanceFieldFont::~DistanceFieldFont() @@ -294,7 +295,8 @@ DistanceFieldFont* QDistanceFieldGlyphCache::getOrCreateDistanceFieldFont(const // create new font cache // we set the parent node to nullptr, since the parent node of QTextureAtlasses // will be set when we pass them to QText2DMaterial later - DistanceFieldFont *dff = new DistanceFieldFont(actualFont, useDoubleRes, nullptr); + Q_ASSERT(m_rootNode); + DistanceFieldFont *dff = new DistanceFieldFont(actualFont, useDoubleRes, m_rootNode); m_fonts.insert(key, dff); return dff; } @@ -331,11 +333,10 @@ QDistanceFieldGlyphCache::Glyph refAndGetGlyph(DistanceFieldFont *dff, quint32 g if (dff) { const auto entry = dff->refGlyph(glyph); - if (entry.atlas()) { - ret.glyphPathBoundingRect = entry.glyphPathBoundingRect(); - ret.texCoords = entry.texCoords(); - ret.texture = entry.atlas(); - } + Q_ASSERT(entry.atlas()); + ret.glyphPathBoundingRect = entry.glyphPathBoundingRect(); + ret.texCoords = entry.texCoords(); + ret.texture = entry.atlas(); } return ret; diff --git a/src/extras/text/qtext2dentity.cpp b/src/extras/text/qtext2dentity.cpp index 190031755..a44a8b193 100644 --- a/src/extras/text/qtext2dentity.cpp +++ b/src/extras/text/qtext2dentity.cpp @@ -310,8 +310,9 @@ void QText2DEntityPrivate::setCurrentGlyphRuns(const QList &runs) delete m_renderers.takeLast(); while (m_renderers.size() < renderData.size()) { - DistanceFieldTextRenderer *renderer = new DistanceFieldTextRenderer(q_func()); + DistanceFieldTextRenderer *renderer = new DistanceFieldTextRenderer(); renderer->setColor(m_color); + renderer->setParent(q_func()); m_renderers << renderer; } -- cgit v1.2.3 From 0f3b68fd2d7357ca4ec5a3373711c80bb89e27a2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 16 Feb 2023 07:18:49 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3d Change-Id: Ic8ffd0eb5fcc55544c67a49347c4d6107eb92cb1 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index e778224f5..7e95ceb67 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: a9962aaaba87eb1344c0eb9cbfc944c8882473c2 + ref: c581474dfbfcb517573d8870cbbdc53f579e09cc required: true ../tqtc-qtdeclarative: - ref: 176e6eb8357535d19d3ca079c71b96915c1bef9c + ref: a619c76c2c141accf37bb3478718d9b48c6833f0 required: false ../tqtc-qtshadertools: - ref: ee12250010aebd59ff0f6e95fa103b2186250975 + ref: 4b4cd731e85b207106087beb776a803e98304324 required: false -- cgit v1.2.3 From 37320d573acfcaa2cfeafc9cef816afd802ffdb4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 21 Feb 2023 14:51:29 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3d Change-Id: I125f94029eda1892e9399f41e7e34b65643e3d4a Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 7e95ceb67..c10e0d90a 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: c581474dfbfcb517573d8870cbbdc53f579e09cc + ref: 9ac6224081621845bda9f5348d047cb9f65c43fb required: true ../tqtc-qtdeclarative: - ref: a619c76c2c141accf37bb3478718d9b48c6833f0 + ref: b20b2831bd81aff74e0dc4b664d6df9abb0f4eed required: false ../tqtc-qtshadertools: - ref: 4b4cd731e85b207106087beb776a803e98304324 + ref: 6dbac739d02bfb3383b2f47df2966661122ab742 required: false -- cgit v1.2.3 From 35c1d831efb03abd39bfeab1a0fc304bdb151151 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 27 Feb 2023 07:09:10 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3d Change-Id: I3f20a65995e12ccb9dcfe3b225ab1ac4e2941539 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index c10e0d90a..0abdc12dc 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: 9ac6224081621845bda9f5348d047cb9f65c43fb + ref: d9feaffdfbbd9c3b795e31cd141c842a52ba8124 required: true ../tqtc-qtdeclarative: - ref: b20b2831bd81aff74e0dc4b664d6df9abb0f4eed + ref: 7f04b610cb2c7214e5aba8a1709481dc4c8b306f required: false ../tqtc-qtshadertools: - ref: 6dbac739d02bfb3383b2f47df2966661122ab742 + ref: d757ffb29f2a871c5f53c7755a59349d3324b5b0 required: false -- cgit v1.2.3 From a8b674ee0a0e87e9645e5dba9b2967602727a5e7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 10 Mar 2023 10:27:53 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3d Change-Id: Id5552015faa19e9bdc9a393bba3c28cbf3482d69 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 0abdc12dc..4f407ce3f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: d9feaffdfbbd9c3b795e31cd141c842a52ba8124 + ref: 2e46273e26b9e0bed69f766c77e93b86cf72dcd6 required: true ../tqtc-qtdeclarative: - ref: 7f04b610cb2c7214e5aba8a1709481dc4c8b306f + ref: cb0341c1b0797c91cc6d54cb997ce556cc927e4c required: false ../tqtc-qtshadertools: - ref: d757ffb29f2a871c5f53c7755a59349d3324b5b0 + ref: 395321bc84698c1e343a3110b7d6df223ea376ec required: false -- cgit v1.2.3 From 92049c0b4ef9aa973c390b04020fb7416298b8dc Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 13 Mar 2023 06:45:39 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3d Change-Id: Iba701a2c8685084de9bc3ca778bead3b24433cb5 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 4f407ce3f..8b18ab674 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: 2e46273e26b9e0bed69f766c77e93b86cf72dcd6 + ref: 9b1944d24a5a76826b4929e09f2b470120b795f2 required: true ../tqtc-qtdeclarative: - ref: cb0341c1b0797c91cc6d54cb997ce556cc927e4c + ref: 9b821b49cef736e14722f8473bc23dda1e0d58e0 required: false ../tqtc-qtshadertools: - ref: 395321bc84698c1e343a3110b7d6df223ea376ec + ref: d5fb7d64d76dd3277b26b079a78a1c1e25e2e406 required: false -- cgit v1.2.3 From f3fb650f06d504af974b2ccbc6e085ce666e0381 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 16 Mar 2023 16:55:09 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3d Change-Id: Id989e9c312c815df770f560f865aa1bd0606684a Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 8b18ab674..c56041d8c 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: 9b1944d24a5a76826b4929e09f2b470120b795f2 + ref: 3282d501ef493890c8cdc5d8c27dd8cb187a0077 required: true ../tqtc-qtdeclarative: - ref: 9b821b49cef736e14722f8473bc23dda1e0d58e0 + ref: e86f1d1c0d10c907ce4463089682c88aec35c66a required: false ../tqtc-qtshadertools: - ref: d5fb7d64d76dd3277b26b079a78a1c1e25e2e406 + ref: 34de9d64987c62c975789460dfd8d625a51982da required: false -- cgit v1.2.3 From 03707beb2336a7613dd2293fb5cce68ba4513044 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 22 Mar 2023 07:56:02 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3d Change-Id: I96e09f81e3b90e0cc6e16350e8a59c6c8b00e763 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index c56041d8c..37f6f4f03 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: 3282d501ef493890c8cdc5d8c27dd8cb187a0077 + ref: caf0a9c0bd3620979a34b454a4ccffa9d60db886 required: true ../tqtc-qtdeclarative: - ref: e86f1d1c0d10c907ce4463089682c88aec35c66a + ref: 8cbb9c512fd17388833b1b77835e7c3991307e30 required: false ../tqtc-qtshadertools: - ref: 34de9d64987c62c975789460dfd8d625a51982da + ref: 7b3bab973e294c45d1b1e71c673ecda66d468771 required: false -- cgit v1.2.3 From f086bf0d8f492ae80c688a3646d46725c42165a0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 27 Mar 2023 07:06:25 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3d Change-Id: I3ae665f642c7ced1947cc54eaf78ff534e4b0747 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 37f6f4f03..ae7ab9ad4 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: caf0a9c0bd3620979a34b454a4ccffa9d60db886 + ref: d2d42d45a71b6ae10d0c7459dcb69a7e7d6295b9 required: true ../tqtc-qtdeclarative: - ref: 8cbb9c512fd17388833b1b77835e7c3991307e30 + ref: b2b288680ab2bd5a59dd744a5bf17813c7aa6a4b required: false ../tqtc-qtshadertools: - ref: 7b3bab973e294c45d1b1e71c673ecda66d468771 + ref: 216ada0e016a9b602a0580360a10ce7da4e14280 required: false -- cgit v1.2.3 From ef051d6a341bd8e426715421622ed8d63d2afb40 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 29 Mar 2023 07:10:04 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3d Change-Id: Ic8b65c99777dbc1d33f4581b7758091d9f8d0de8 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index ae7ab9ad4..958eb4332 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: d2d42d45a71b6ae10d0c7459dcb69a7e7d6295b9 + ref: ca128e25119c0b259d083567c796bfa67b100a42 required: true ../tqtc-qtdeclarative: - ref: b2b288680ab2bd5a59dd744a5bf17813c7aa6a4b + ref: a7df6331b29e44ed364fcd7297c4e1bc6ce2167c required: false ../tqtc-qtshadertools: - ref: 216ada0e016a9b602a0580360a10ce7da4e14280 + ref: 58b31c6148a6a49273a092b1d15c18b441c980bd required: false -- cgit v1.2.3