diff options
| author | Tarja Sundqvist <[email protected]> | 2024-06-06 14:04:25 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <[email protected]> | 2024-06-06 14:04:25 +0300 |
| commit | 1700b5d26d40cf36b99f1481fd516f15e8f0aa71 (patch) | |
| tree | d03e80f6d38acc9588535ede849d946acef61696 | |
| parent | 94e0cc9a930e57577a6d7d35adb00a663e2a9a27 (diff) | |
| parent | ead2a99776388b4efd385067872843312a42b2fe (diff) | |
Merge tag 'v6.2.9-lts' into tqtc/lts-6.2-opensourcev6.2.9-lts-lgpl
Qt 6.2.9-lts release
Conflicts solved:
dependencies.yaml
Change-Id: I0d257f10b72f3e7e385588298a6728def1a172c2
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 8 | ||||
| -rw-r--r-- | src/quick3dparticles/qquick3dparticlemodelshape.cpp | 3 |
4 files changed, 8 insertions, 7 deletions
diff --git a/.cmake.conf b/.cmake.conf index e62fae5e..beccb22d 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.2.8") +set(QT_REPO_MODULE_VERSION "6.2.9") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "") diff --git a/.qmake.conf b/.qmake.conf index ae8c1a24..b90c6728 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 6.2.8 +MODULE_VERSION = 6.2.9 diff --git a/dependencies.yaml b/dependencies.yaml index c1a696d5..c3834c27 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtbase: - ref: 4c1c38dede55565afa846685b3e19cf8f1cfed0c + ref: f131837a9fcc83dcfb70a0a91b1baacb6ccf14a2 required: true ../tqtc-qtdeclarative: - ref: 9919f58fce6329a233ca885188d0aba5f484e546 + ref: a1b4a68d1165115779ac925f43847a5735671917 required: true ../tqtc-qtquicktimeline: - ref: 352fe99d1b293c698e11fc09b08521c4b7fc45fb + ref: 9020b6861f727ed82825366a4da731e4f4f0c0e6 required: false ../tqtc-qtshadertools: - ref: 754297822b244b98494e5ab09ca024a2e7acb54a + ref: c0efa3c44c056e1307e25ad8f3dd6db6f19ef135 required: true diff --git a/src/quick3dparticles/qquick3dparticlemodelshape.cpp b/src/quick3dparticles/qquick3dparticlemodelshape.cpp index cd894ca6..1cef4d06 100644 --- a/src/quick3dparticles/qquick3dparticlemodelshape.cpp +++ b/src/quick3dparticles/qquick3dparticlemodelshape.cpp @@ -296,7 +296,8 @@ void QQuick3DParticleModelShape::calculateModelVertexPositions() auto entries = mesh.vertexBuffer().entries; int posOffset = 0; int posCount = 0; - QSSGMesh::Mesh::ComponentType posType; + // Just set 'posType' to something to avoid invalid 'maybe-uninitialized' warning + QSSGMesh::Mesh::ComponentType posType = QSSGMesh::Mesh::ComponentType::UnsignedInt8; for (int i = 0; i < entries.size(); ++i) { const char *nameStr = entries[i].name.constData(); if (!strcmp(nameStr, QSSGMesh::MeshInternal::getPositionAttrName())) { |