3 files changed, 12 insertions, 8 deletions
diff --git a/tests/manual/rhi/compressedtexture_bc1/compressedtexture_bc1.cpp b/tests/manual/rhi/compressedtexture_bc1/compressedtexture_bc1.cpp
index bb3722bec5..af454c2487 100644
--- a/tests/manual/rhi/compressedtexture_bc1/compressedtexture_bc1.cpp
+++ b/tests/manual/rhi/compressedtexture_bc1/compressedtexture_bc1.cpp
@@ -165,11 +165,13 @@ void Window::customRender()
         u->updateDynamicBuffer(d.ubuf, 64, 4, &flip);
     }
     if (!d.compressedData.isEmpty()) {
-        QRhiTextureUploadDescription desc;
+        QVarLengthArray<QRhiTextureUploadEntry, 16> descEntries;
         for (int i = 0; i < d.compressedData.count(); ++i) {
             QRhiTextureSubresourceUploadDescription image(d.compressedData[i].constData(), d.compressedData[i].size());
-            desc.append({ 0, i, image });
+            descEntries.append({ 0, i, image });
         }
+        QRhiTextureUploadDescription desc;
+        desc.setEntries(descEntries.cbegin(), descEntries.cend());
         u->uploadTexture(d.tex, desc);
         d.compressedData.clear();
     }
diff --git a/tests/manual/rhi/mrt/mrt.cpp b/tests/manual/rhi/mrt/mrt.cpp
index dc72c7d194..dfec5bb1d1 100644
--- a/tests/manual/rhi/mrt/mrt.cpp
+++ b/tests/manual/rhi/mrt/mrt.cpp
@@ -143,10 +143,10 @@ void Window::customInit()
     }
 
     QRhiTextureRenderTargetDescription rtDesc;
-    QVector<QRhiColorAttachment> att;
+    QRhiColorAttachment att[ATTCOUNT];
     for (int i = 0; i < ATTCOUNT; ++i)
-        att.append(QRhiColorAttachment(d.colData[i].tex));
-    rtDesc.setColorAttachments(att);
+        att[i] = QRhiColorAttachment(d.colData[i].tex);
+    rtDesc.setColorAttachments(att, att + ATTCOUNT);
     d.rt = m_r->newTextureRenderTarget(rtDesc);
     d.releasePool << d.rt;
     d.rtRp = d.rt->newCompatibleRenderPassDescriptor();
diff --git a/tests/manual/rhi/triquadcube/texturedcuberenderer.cpp b/tests/manual/rhi/triquadcube/texturedcuberenderer.cpp
index 3f15881e2d..8c5845d4fc 100644
--- a/tests/manual/rhi/triquadcube/texturedcuberenderer.cpp
+++ b/tests/manual/rhi/triquadcube/texturedcuberenderer.cpp
@@ -181,16 +181,18 @@ void TexturedCubeRenderer::queueResourceUpdates(QRhiResourceUpdateBatch *resourc
 
     if (!m_image.isNull()) {
         if (MIPMAP) {
-            QRhiTextureUploadDescription desc;
+            QVarLengthArray<QRhiTextureUploadEntry, 16> descEntries;
             if (!AUTOGENMIPMAP) {
                 // the ghetto mipmap generator...
                 for (int i = 0, ie = m_r->mipLevelsForSize(m_image.size()); i != ie; ++i) {
                     QImage image = m_image.scaled(m_r->sizeForMipLevel(i, m_image.size()));
-                    desc.append({ 0, i, image });
+                    descEntries.append({ 0, i, image });
                 }
             } else {
-                desc.append({ 0, 0, m_image });
+                descEntries.append({ 0, 0, m_image });
             }
+            QRhiTextureUploadDescription desc;
+            desc.setEntries(descEntries.cbegin(), descEntries.cend());
             resourceUpdates->uploadTexture(m_tex, desc);
             if (AUTOGENMIPMAP)
                 resourceUpdates->generateMips(m_tex);