From 7e53eb48b9cab66a7ff3170859d1f8a65fa2e5a5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 7 Jul 2022 16:54:05 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtdatavis3d Change-Id: I23a9d12bfd17fa964bf635b8670166152f38a796 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 1d05ed5b..9f4e239b 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: 8b8cb9267425af3cd825abc8cac459a24d9cf9c0 + ref: d4bba108fd0feb3abb81b5a92b53c82de93fcb84 required: true ../tqtc-qtdeclarative: - ref: a64e5314cc9480d2c06c4cd45a5829628173ba41 + ref: 4419d9eed8d816674ceb074269ebd0c45315f97f required: false ../tqtc-qtmultimedia: - ref: cd1e34ec7a02f4a964861df01dd97df4a82d9be0 + ref: 7a4384ece8668001168664cb609f3aad1fd83421 required: false -- cgit v1.2.3 From 577c01d11c5588e8a47950d2b3dda5e9ec5078af Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 18 Jul 2022 09:37:58 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtdatavis3d Change-Id: I60ec236c837a8b4cce75a36370de9c2700e98956 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 9f4e239b..839467f3 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: d4bba108fd0feb3abb81b5a92b53c82de93fcb84 + ref: 4702c6257695667c8a365bf65826e0880e0dac5a required: true ../tqtc-qtdeclarative: - ref: 4419d9eed8d816674ceb074269ebd0c45315f97f + ref: 67519f4c7624ed4b99ca554bbf7cfef7838db560 required: false ../tqtc-qtmultimedia: - ref: 7a4384ece8668001168664cb609f3aad1fd83421 + ref: bbc38427de23c108754393d28979d7436479cd35 required: false -- cgit v1.2.3 From 9d266d1b3f09481d40cab03d01ddef1e8ace53fa Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 22 Jul 2022 06:35:34 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtdatavis3d Change-Id: Ib308d91ab5c0b56a24bd1ecf430699a433c1515a 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 839467f3..60277d58 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: 4702c6257695667c8a365bf65826e0880e0dac5a + ref: f8b2e24f7a283b58cc92666f3ed39eac3f3fbad1 required: true ../tqtc-qtdeclarative: - ref: 67519f4c7624ed4b99ca554bbf7cfef7838db560 + ref: be930b7a20461b0096212aa10559e400fb97affc required: false ../tqtc-qtmultimedia: - ref: bbc38427de23c108754393d28979d7436479cd35 + ref: 67cfb931ce5f3017238de9a2629c75edf4500889 required: false -- cgit v1.2.3 From eaf62f12a7376623429f17a41d024cc7e71a0209 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 3 Aug 2022 21:37:20 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtdatavis3d Change-Id: I030328479a082eff369bdd12b0de5fb29fa95a6e 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 60277d58..a246f31c 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: f8b2e24f7a283b58cc92666f3ed39eac3f3fbad1 + ref: cdce76fc680f6b26cbc6d7210d617bff0e436483 required: true ../tqtc-qtdeclarative: - ref: be930b7a20461b0096212aa10559e400fb97affc + ref: 973e96340401e17d9109a2d8e41324e72fb9b0fc required: false ../tqtc-qtmultimedia: - ref: 67cfb931ce5f3017238de9a2629c75edf4500889 + ref: 0d44316689cf12b60f479525d4ff18d0def7a3fb required: false -- cgit v1.2.3 From b738ede015737d3f7105fc7f81a1f2f6a63d1322 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 5 Aug 2022 08:53:20 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtdatavis3d Change-Id: I59e485dea70f1a11344d69fccc3b484760d76a9b 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 a246f31c..d8d4251c 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: cdce76fc680f6b26cbc6d7210d617bff0e436483 + ref: 36e4a39985757d6f21485777b7f5248dc161120d required: true ../tqtc-qtdeclarative: - ref: 973e96340401e17d9109a2d8e41324e72fb9b0fc + ref: 105ebb7dbd123f8d66f9f5ada266c73c14b6b128 required: false ../tqtc-qtmultimedia: - ref: 0d44316689cf12b60f479525d4ff18d0def7a3fb + ref: 46cf3cf47538928d2d8b813705293422c1afe10b required: false -- cgit v1.2.3 From 035afded50a9dd1db10935b435dae19104829e26 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 9 Aug 2022 05:30:39 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtdatavis3d Change-Id: I6cdb66e066f108658fbdda30ae3764d0705b49e0 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 d8d4251c..a67f23b7 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: 36e4a39985757d6f21485777b7f5248dc161120d + ref: b81f6d838a2ca97d0b8c1e326cb482fb5e409afe required: true ../tqtc-qtdeclarative: - ref: 105ebb7dbd123f8d66f9f5ada266c73c14b6b128 + ref: 7ef560591f48f6636bac526f46f0116ac2f149ac required: false ../tqtc-qtmultimedia: - ref: 46cf3cf47538928d2d8b813705293422c1afe10b + ref: 1b9df93e0f95016ed00c2f0aeaeb8f89852b8fd0 required: false -- cgit v1.2.3 From 5877a0d057994c4993cc53ce49fe8dcab04afb80 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 15 Aug 2022 06:12:02 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtdatavis3d Change-Id: I139e4b6c8f04c4bdb19fff04ffa2e3953b57f375 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 a67f23b7..521cd791 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: b81f6d838a2ca97d0b8c1e326cb482fb5e409afe + ref: 59d2bda7948de97e6e883f36b2a07831d237119b required: true ../tqtc-qtdeclarative: - ref: 7ef560591f48f6636bac526f46f0116ac2f149ac + ref: 3c44edbc9ea2d9b6d3fbe85d967f1a6a44dbb4bb required: false ../tqtc-qtmultimedia: - ref: 1b9df93e0f95016ed00c2f0aeaeb8f89852b8fd0 + ref: fd520cce3868cfec9fab0888b4e35fcb952d5552 required: false -- cgit v1.2.3 From a2c3e747f1b694dcb3189f5b63209b0bde171801 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 17 Aug 2022 18:48:53 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtdatavis3d Change-Id: I53e814cca4c409cd7d3f63d3efcb0a7e9990b3dc 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 521cd791..b9544c7d 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: 59d2bda7948de97e6e883f36b2a07831d237119b + ref: abd7a7132b5f2890b1ea428774d46192ee56fc67 required: true ../tqtc-qtdeclarative: - ref: 3c44edbc9ea2d9b6d3fbe85d967f1a6a44dbb4bb + ref: 6ded87fb0f1d59d9d52d21ad0edefbf72b3a5867 required: false ../tqtc-qtmultimedia: - ref: fd520cce3868cfec9fab0888b4e35fcb952d5552 + ref: e840f13bf1b5a25260a57b64e1678b6500860ce6 required: false -- cgit v1.2.3 From 0e23f521983981b0b1d948e6860c5a61f63a35be Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Tue, 16 Aug 2022 12:55:18 +0300 Subject: Bump version to 6.2.6 Change-Id: I6a7fbf33ac8544f3849659f7905172c66473918b 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 940e347a..6f32ba4d 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.2.5") +set(QT_REPO_MODULE_VERSION "6.2.6") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "") diff --git a/.qmake.conf b/.qmake.conf index f5f4840b..032ff445 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,6 +2,6 @@ load(qt_build_config) DEFINES += QT_NO_JAVA_STYLE_ITERATORS -MODULE_VERSION = 6.2.5 +MODULE_VERSION = 6.2.6 CONFIG += warning_clean CMAKE_MODULE_TESTS=- -- cgit v1.2.3 From 42e42cb15acbbbecd0bb1e6f129c7944c6f43e2f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 19 Aug 2022 06:45:59 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtdatavis3d Change-Id: Id2e4abe5c321ba81959986d21798724e38d28c11 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 b9544c7d..6469fb38 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: abd7a7132b5f2890b1ea428774d46192ee56fc67 + ref: d5804f86ce506611d04e530a3652b3b3667939a9 required: true ../tqtc-qtdeclarative: - ref: 6ded87fb0f1d59d9d52d21ad0edefbf72b3a5867 + ref: 6f6b7a0096b8dd430e1091a934432fa1caeb8655 required: false ../tqtc-qtmultimedia: - ref: e840f13bf1b5a25260a57b64e1678b6500860ce6 + ref: 9baf4f9f817ee5be6346b5b7ed1d2f3703502ffb required: false -- cgit v1.2.3 From 857d17dd4889c00317873b6d01be89317b879a1c Mon Sep 17 00:00:00 2001 From: Tomi Korpipaa Date: Thu, 25 Aug 2022 09:07:45 +0300 Subject: Do not crash if custom object load fails MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There was no check for the existence of UVs or normals in an OBJ file. A check for those was added. Additionally a debug message was added in case model loading fails due to missing UVs or normals. Furthermore, we no more qFatal out when custom object loading fails. Fixes: QTBUG-105398 Change-Id: Ie2742fb4307fe117e313cedf8111bc8f460f9c7b Reviewed-by: Sami Varanka Reviewed-by: Kwanghyo Park Reviewed-by: Dilek Akcay Reviewed-by: Tomi Korpipää (cherry picked from commit 449f644df503dc409514cafd7b46ee8664e4d451) Reviewed-by: Qt Cherry-pick Bot --- src/datavisualization/data/customrenderitem.cpp | 3 +- src/datavisualization/data/customrenderitem_p.h | 2 +- src/datavisualization/data/qcustom3ditem.cpp | 7 +- .../engine/abstract3drenderer.cpp | 11 ++- src/datavisualization/utils/meshloader.cpp | 4 + src/datavisualization/utils/objecthelper.cpp | 86 ++++++++++++---------- 6 files changed, 70 insertions(+), 43 deletions(-) diff --git a/src/datavisualization/data/customrenderitem.cpp b/src/datavisualization/data/customrenderitem.cpp index 5ecc7ab6..1047fa25 100644 --- a/src/datavisualization/data/customrenderitem.cpp +++ b/src/datavisualization/data/customrenderitem.cpp @@ -68,9 +68,10 @@ CustomRenderItem::~CustomRenderItem() ObjectHelper::releaseObjectHelper(m_renderer, m_object); } -void CustomRenderItem::setMesh(const QString &meshFile) +bool CustomRenderItem::setMesh(const QString &meshFile) { ObjectHelper::resetObjectHelper(m_renderer, m_object, meshFile); + return m_object ? true : false; } void CustomRenderItem::setColorTable(const QList &colors) diff --git a/src/datavisualization/data/customrenderitem_p.h b/src/datavisualization/data/customrenderitem_p.h index daaf45e2..32653e51 100644 --- a/src/datavisualization/data/customrenderitem_p.h +++ b/src/datavisualization/data/customrenderitem_p.h @@ -59,7 +59,7 @@ public: inline void setTexture(GLuint texture) { m_texture = texture; } inline GLuint texture() const { return m_texture; } - void setMesh(const QString &meshFile); + bool setMesh(const QString &meshFile); inline ObjectHelper *mesh() const { return m_object; } inline void setScaling(const QVector3D &scaling) { m_scaling = scaling; } inline const QVector3D &scaling() const { return m_scaling; } diff --git a/src/datavisualization/data/qcustom3ditem.cpp b/src/datavisualization/data/qcustom3ditem.cpp index a405517b..5b477b4d 100644 --- a/src/datavisualization/data/qcustom3ditem.cpp +++ b/src/datavisualization/data/qcustom3ditem.cpp @@ -58,7 +58,9 @@ QT_BEGIN_NAMESPACE /*! \qmlproperty string Custom3DItem::meshFile * * The item mesh file name. The item in the file must be in Wavefront OBJ format and include - * vertices, normals, and UVs. It also needs to be in triangles. + * vertices, normals, and UVs. It also needs to be in triangles. If the file is missing either + * normals or UVs, loading will fail with an error message to the console output and the item will + * not be rendered. */ /*! \qmlproperty string Custom3DItem::textureFile @@ -203,6 +205,9 @@ QCustom3DItem::~QCustom3DItem() * * The item in the file must be in Wavefront OBJ format and include * vertices, normals, and UVs. It also needs to be in triangles. + * If the file is missing either normals or UVs, loading will fail + * with an error message to the console output and the item will + * not be rendered. */ void QCustom3DItem::setMeshFile(const QString &meshFile) { diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp index 111e54f1..febe10d2 100644 --- a/src/datavisualization/engine/abstract3drenderer.cpp +++ b/src/datavisualization/engine/abstract3drenderer.cpp @@ -749,8 +749,10 @@ void Abstract3DRenderer::updateCustomData(const QList &customIt CustomRenderItem *renderItem = m_customRenderCache.value(item); if (!renderItem) renderItem = addCustomItem(item); - renderItem->setValid(true); - renderItem->setIndex(i); // always update index, as it must match the custom item index + if (renderItem) { + renderItem->setValid(true); + renderItem->setIndex(i); // always update index, as it must match the custom item index + } } // Check render item cache and remove items that are not in customItems list anymore @@ -1133,7 +1135,10 @@ CustomRenderItem *Abstract3DRenderer::addCustomItem(QCustom3DItem *item) CustomRenderItem *newItem = new CustomRenderItem(); newItem->setRenderer(this); newItem->setItemPointer(item); // Store pointer for render item updates - newItem->setMesh(item->meshFile()); + if (!newItem->setMesh(item->meshFile())) { + delete newItem; + return nullptr; + } newItem->setOrigPosition(item->position()); newItem->setOrigScaling(item->scaling()); newItem->setScalingAbsolute(item->isScalingAbsolute()); diff --git a/src/datavisualization/utils/meshloader.cpp b/src/datavisualization/utils/meshloader.cpp index adb8714e..42e31ab1 100644 --- a/src/datavisualization/utils/meshloader.cpp +++ b/src/datavisualization/utils/meshloader.cpp @@ -81,6 +81,10 @@ bool MeshLoader::loadOBJ(const QString &path, QList &out_vertices, QStringList set1 = lineContents.at(1).split(slashTag); QStringList set2 = lineContents.at(2).split(slashTag); QStringList set3 = lineContents.at(3).split(slashTag); + if (set1.length() < 3 || set2.length() < 3 || set3.length() < 3) { + qWarning("The file being loaded is missing UVs and/or normals"); + return false; + } vertexIndex[0] = set1.at(0).toUInt(); vertexIndex[1] = set2.at(0).toUInt(); vertexIndex[2] = set3.at(0).toUInt(); diff --git a/src/datavisualization/utils/objecthelper.cpp b/src/datavisualization/utils/objecthelper.cpp index 0f25ede8..60d9d2b4 100644 --- a/src/datavisualization/utils/objecthelper.cpp +++ b/src/datavisualization/utils/objecthelper.cpp @@ -113,10 +113,19 @@ ObjectHelper *ObjectHelper::getObjectHelper(const Abstract3DRenderer *cacheId, objRef = new ObjectHelperRef; objRef->refCount = 0; objRef->obj = new ObjectHelper(objectFile); - objectTable->insert(objectFile, objRef); + if (objRef->obj->m_meshDataLoaded) { + objectTable->insert(objectFile, objRef); + } else { + delete objRef->obj; + delete objRef; + objRef = nullptr; + } + } + if (objRef) { + objRef->refCount++; + return objRef->obj; } - objRef->refCount++; - return objRef->obj; + return nullptr; } void ObjectHelper::load() @@ -140,41 +149,44 @@ void ObjectHelper::load() QList uvs; QList normals; bool loadOk = MeshLoader::loadOBJ(m_objectFile, vertices, uvs, normals); - if (!loadOk) - qFatal("loading failed"); - - // Index vertices - VertexIndexer::indexVBO(vertices, uvs, normals, m_indices, m_indexedVertices, m_indexedUVs, - m_indexedNormals); - - m_indexCount = m_indices.size(); - - glGenBuffers(1, &m_vertexbuffer); - glBindBuffer(GL_ARRAY_BUFFER, m_vertexbuffer); - glBufferData(GL_ARRAY_BUFFER, m_indexedVertices.size() * sizeof(QVector3D), - &m_indexedVertices.at(0), - GL_STATIC_DRAW); - glGenBuffers(1, &m_normalbuffer); - glBindBuffer(GL_ARRAY_BUFFER, m_normalbuffer); - glBufferData(GL_ARRAY_BUFFER, m_indexedNormals.size() * sizeof(QVector3D), - &m_indexedNormals.at(0), - GL_STATIC_DRAW); - - glGenBuffers(1, &m_uvbuffer); - glBindBuffer(GL_ARRAY_BUFFER, m_uvbuffer); - glBufferData(GL_ARRAY_BUFFER, m_indexedUVs.size() * sizeof(QVector2D), - &m_indexedUVs.at(0), GL_STATIC_DRAW); - - glGenBuffers(1, &m_elementbuffer); - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_elementbuffer); - glBufferData(GL_ELEMENT_ARRAY_BUFFER, m_indices.size() * sizeof(GLuint), - &m_indices.at(0), GL_STATIC_DRAW); - - glBindBuffer(GL_ARRAY_BUFFER, 0); - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); - - m_meshDataLoaded = true; + if (!loadOk) { + qCritical() << "Loading" << m_objectFile << "failed"; + m_meshDataLoaded = false; + } else { + // Index vertices + VertexIndexer::indexVBO(vertices, uvs, normals, m_indices, m_indexedVertices, m_indexedUVs, + m_indexedNormals); + + m_indexCount = m_indices.size(); + + glGenBuffers(1, &m_vertexbuffer); + glBindBuffer(GL_ARRAY_BUFFER, m_vertexbuffer); + glBufferData(GL_ARRAY_BUFFER, m_indexedVertices.size() * sizeof(QVector3D), + &m_indexedVertices.at(0), + GL_STATIC_DRAW); + + glGenBuffers(1, &m_normalbuffer); + glBindBuffer(GL_ARRAY_BUFFER, m_normalbuffer); + glBufferData(GL_ARRAY_BUFFER, m_indexedNormals.size() * sizeof(QVector3D), + &m_indexedNormals.at(0), + GL_STATIC_DRAW); + + glGenBuffers(1, &m_uvbuffer); + glBindBuffer(GL_ARRAY_BUFFER, m_uvbuffer); + glBufferData(GL_ARRAY_BUFFER, m_indexedUVs.size() * sizeof(QVector2D), + &m_indexedUVs.at(0), GL_STATIC_DRAW); + + glGenBuffers(1, &m_elementbuffer); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_elementbuffer); + glBufferData(GL_ELEMENT_ARRAY_BUFFER, m_indices.size() * sizeof(GLuint), + &m_indices.at(0), GL_STATIC_DRAW); + + glBindBuffer(GL_ARRAY_BUFFER, 0); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); + + m_meshDataLoaded = true; + } } QT_END_NAMESPACE -- cgit v1.2.3 From e6106ceddde0b66ffcb1766cb3c4f72f19950104 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 29 Aug 2022 06:23:40 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtdatavis3d Change-Id: I26b2fe5aa629a3b72272560814a96df9fc1b60e0 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 6469fb38..d3b30215 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: d5804f86ce506611d04e530a3652b3b3667939a9 + ref: ddc7a4a2f22c5bcb891814af02d1a7b3d2e5bf63 required: true ../tqtc-qtdeclarative: - ref: 6f6b7a0096b8dd430e1091a934432fa1caeb8655 + ref: 545cd174b2d68ca719a85b82953745ccc322e68e required: false ../tqtc-qtmultimedia: - ref: 9baf4f9f817ee5be6346b5b7ed1d2f3703502ffb + ref: 44f7e6e1f96e83f29780f1c53f57992b2747c0b5 required: false -- cgit v1.2.3 From fc16c790f63453f23d8f970e017b15765f9a7184 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 1 Sep 2022 05:38:20 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtdatavis3d Change-Id: I320ff7827b5e393dae7a415cd72ceedda303e3c4 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 d3b30215..c416236f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: ddc7a4a2f22c5bcb891814af02d1a7b3d2e5bf63 + ref: 656cdb66470d839da53a8ddf4288af27a004db80 required: true ../tqtc-qtdeclarative: - ref: 545cd174b2d68ca719a85b82953745ccc322e68e + ref: 26e1fdf66f5effd7a0bcbf42caded6514d27a322 required: false ../tqtc-qtmultimedia: - ref: 44f7e6e1f96e83f29780f1c53f57992b2747c0b5 + ref: 0c2a46bf96734e24d19a4a5db832fe318fba9020 required: false -- cgit v1.2.3 From a924b6433c82062be7d6c826359180e7d7905e0a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 7 Sep 2022 09:44:00 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtdatavis3d Change-Id: I48ffb27dc53a0cb9c46cfb85da0b79cc3fe10323 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 c416236f..5104a014 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: 656cdb66470d839da53a8ddf4288af27a004db80 + ref: ea80641cbcdf599e10ea16f5438822f46a3e84ae required: true ../tqtc-qtdeclarative: - ref: 26e1fdf66f5effd7a0bcbf42caded6514d27a322 + ref: 60d10fc453019a8123bbfe4021e48c12245b8724 required: false ../tqtc-qtmultimedia: - ref: 0c2a46bf96734e24d19a4a5db832fe318fba9020 + ref: dd2eb0e4d0ba6ee7f9d4f91c7a486394fa1997c8 required: false -- cgit v1.2.3 From c0caa4ee1f41a7d4e6ae8c6ad509be1f08c96026 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 15 Sep 2022 12:11:23 +0000 Subject: Update dependencies on 'tqtc/lts-6.2.6' in qt/tqtc-qtdatavis3d Change-Id: Ibec01e180ce28fa1d3b35ea703a0dd023be32497 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 5104a014..85fb196b 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: ea80641cbcdf599e10ea16f5438822f46a3e84ae + ref: 65ccd8c22d08d088ccb96c695c8e607932b701f7 required: true ../tqtc-qtdeclarative: - ref: 60d10fc453019a8123bbfe4021e48c12245b8724 + ref: 90bfcad717a70859c8823b1caf7d2ab44a7e9a55 required: false ../tqtc-qtmultimedia: - ref: dd2eb0e4d0ba6ee7f9d4f91c7a486394fa1997c8 + ref: 320e2d4fb7eb75f0a7df6d0dffbdd32e2b517060 required: false -- cgit v1.2.3 From 9e23691fc56635d1916b129a94984087f160ef9d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 17 Sep 2022 04:13:49 +0000 Subject: Update dependencies on 'tqtc/lts-6.2.6' in qt/tqtc-qtdatavis3d Change-Id: Iaa3a39ec432afe438ddcfcfda2ce985e3a6121bb 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 85fb196b..f997c0ea 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: 65ccd8c22d08d088ccb96c695c8e607932b701f7 + ref: a4aeb081769cd0f5817c8e84b4740f315aa3b673 required: true ../tqtc-qtdeclarative: - ref: 90bfcad717a70859c8823b1caf7d2ab44a7e9a55 + ref: 7f07dae966bdd059b1dd1cb11c74ab5b89855396 required: false ../tqtc-qtmultimedia: - ref: 320e2d4fb7eb75f0a7df6d0dffbdd32e2b517060 + ref: 7e8baf40e5f1ac85cdcb22a287d34cdbf55d1f7f required: false -- cgit v1.2.3