diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-11-23 09:06:01 +0000 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2021-01-11 11:48:21 +0000 |
| commit | 8a6b7a377d7cada0f4d98b35d2ac28f7e70aff83 (patch) | |
| tree | edceb036960770772b50feb9fe64959d8583d69f /tests | |
| parent | ac9c708d7a34e66922056e5bca84b3cf583d61eb (diff) | |
Update QtQuick API to build with 5.15
Haven't tried to run anything, it just builds
Change-Id: I6c2c2a949bc3892a363697cf38f1608af87c303c
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/quick3d/quick3dbuffer/tst_quick3dbuffer.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/render/scene2d/tst_scene2d.cpp | 4 | ||||
| -rw-r--r-- | tests/manual/manual.pro | 9 |
3 files changed, 13 insertions, 4 deletions
diff --git a/tests/auto/quick3d/quick3dbuffer/tst_quick3dbuffer.cpp b/tests/auto/quick3d/quick3dbuffer/tst_quick3dbuffer.cpp index d59040c80..8583bdf7b 100644 --- a/tests/auto/quick3d/quick3dbuffer/tst_quick3dbuffer.cpp +++ b/tests/auto/quick3d/quick3dbuffer/tst_quick3dbuffer.cpp @@ -67,8 +67,8 @@ private Q_SLOTS: { // GIVEN Qt3DCore::Quick::Quick3DBuffer buf; - const QList<QVector3D> dataArray = { QVector3D(327.0f, 350.0f, 355.0f), - QVector3D(383.0f, 427.0f, 454.0f) }; + const QVector<QVector3D> dataArray = { QVector3D(327.0f, 350.0f, 355.0f), + QVector3D(383.0f, 427.0f, 454.0f) }; const int bufferByteSize = dataArray.size() * sizeof(QVector3D); const QLatin1String filePath("binary_data.bin"); diff --git a/tests/auto/render/scene2d/tst_scene2d.cpp b/tests/auto/render/scene2d/tst_scene2d.cpp index dfd602027..53075c692 100644 --- a/tests/auto/render/scene2d/tst_scene2d.cpp +++ b/tests/auto/render/scene2d/tst_scene2d.cpp @@ -67,7 +67,11 @@ public: e->type() <= QEvent::MouseMove) { QMouseEvent *me = static_cast<QMouseEvent *>(e); m_eventTypes.push_back(e->type()); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) m_mousePoints.push_back(me->position()); +#else + m_mousePoints.push_back(me->pos()); +#endif } return QQuickWindow::event(e); } diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index 8fea8cb48..3a897cf61 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -71,7 +71,6 @@ qtHaveModule(quick) { simple-shaders-qml \ transparency-qml \ transparency-qml-scene3d \ - rendercapture-qml \ additional-attributes-qml \ dynamic-model-loader-qml \ buffercapture-qml \ @@ -81,7 +80,6 @@ qtHaveModule(quick) { transforms-qml \ layerfilter-qml \ tessellation-modes \ - rendercapture-qml-fbo \ blitframebuffer-qml \ raycasting-qml \ raster-qml \ @@ -101,6 +99,13 @@ qtHaveModule(quick) { scene3d-in-sync \ compressed_textures \ boundingvolumes + +greaterThan(QT_MAJOR_VERSION, 6) { + SUBDIRS += \ + rendercapture-qml \ + rendercapture-qml-fbo +} + } qtHaveModule(quickwidgets): SUBDIRS += quickwidget-switch |