summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Korpipaa <tomi.korpipaa@qt.io>2021-02-25 09:33:17 +0200
committerTomi Korpipaa <tomi.korpipaa@qt.io>2021-03-02 07:30:50 +0200
commit7632cf2dd0692aa4c8560bcdda5ce580a8611d4b (patch)
tree6d33314271eb4a1962a97a558d199cb05ba8e860
parentd7a79b49a50017de68f1a9e7b728465ab9398f8d (diff)
Fix building autotests
Change-Id: Id2482b212b20e47ab35dbf33accd1168655a319d Reviewed-by: Tony Leinonen <tony.leinonen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-rw-r--r--tests/auto/runtime/Qt3DSRenderTestBase.cpp2
-rw-r--r--tests/auto/viewer/tst_qt3dsviewer.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/runtime/Qt3DSRenderTestBase.cpp b/tests/auto/runtime/Qt3DSRenderTestBase.cpp
index f4ab079..fb25739 100644
--- a/tests/auto/runtime/Qt3DSRenderTestBase.cpp
+++ b/tests/auto/runtime/Qt3DSRenderTestBase.cpp
@@ -78,7 +78,7 @@ bool NVRenderTestBase::initializeQt3DSRenderer(QSurfaceFormat format)
{
m_coreFactory = qt3ds::render::IQt3DSRenderFactoryCore::CreateRenderFactoryCore("", m_windowSystem,
m_timeProvider);
- m_factory = m_coreFactory->CreateRenderFactory(format, false);
+ m_factory = m_coreFactory->CreateRenderFactory(format, false, nullptr);
m_rc = m_factory->GetQt3DSRenderContext();
m_renderImpl = new qt3ds::render::Qt3DSRendererImpl(*m_rc);
diff --git a/tests/auto/viewer/tst_qt3dsviewer.cpp b/tests/auto/viewer/tst_qt3dsviewer.cpp
index 2273f89..084d8ae 100644
--- a/tests/auto/viewer/tst_qt3dsviewer.cpp
+++ b/tests/auto/viewer/tst_qt3dsviewer.cpp
@@ -105,7 +105,7 @@ void tst_qt3dsviewer::cleanup()
{
deleteCreated();
if (!m_ignoreError)
- QCOMPARE(m_studio3DItem->property("error").toString(), {});
+ QCOMPARE(m_studio3DItem->property("error").toString(), QString());
m_studio3DItem = nullptr;
m_viewer->hide();
m_viewer->deleteLater();