diff options
| -rw-r--r-- | src/render/framegraph/qrendercapture.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/input/mousedevice/tst_mousedevice.cpp | 38 |
2 files changed, 27 insertions, 15 deletions
diff --git a/src/render/framegraph/qrendercapture.cpp b/src/render/framegraph/qrendercapture.cpp index 5bda569f9..21eee51f6 100644 --- a/src/render/framegraph/qrendercapture.cpp +++ b/src/render/framegraph/qrendercapture.cpp @@ -119,6 +119,7 @@ namespace Qt3DRender { * \since 5.9 */ +#if QT_DEPRECATED_SINCE(5, 9) /*! * \qmlmethod void Qt3D.Render::RenderCaptureReply::saveToFile(fileName) * \deprecated @@ -127,6 +128,7 @@ namespace Qt3DRender { * * Deprecated in 5.9. Use saveImage(). */ +#endif /*! * \qmlmethod RenderCaptureReply Qt3D.Render::RenderCapture::requestCapture(int captureId) @@ -226,6 +228,7 @@ bool QRenderCaptureReply::saveImage(const QString &fileName) const return false; } +#if QT_DEPRECATED_SINCE(5, 9) /*! * \deprecated * Saves the render capture result as an image to \a fileName. @@ -238,6 +241,7 @@ void QRenderCaptureReply::saveToFile(const QString &fileName) const if (d->m_complete) d->m_image.save(fileName); } +#endif /*! * \internal diff --git a/tests/auto/input/mousedevice/tst_mousedevice.cpp b/tests/auto/input/mousedevice/tst_mousedevice.cpp index 64447d0de..fac317a49 100644 --- a/tests/auto/input/mousedevice/tst_mousedevice.cpp +++ b/tests/auto/input/mousedevice/tst_mousedevice.cpp @@ -178,11 +178,14 @@ private Q_SLOTS: Qt3DInput::Input::MouseDevice backendMouseDevice; // WHEN - auto eventList = QList<QT_PREPEND_NAMESPACE(QWheelEvent)>() << QT_PREPEND_NAMESPACE(QWheelEvent)(QPointF(500.0f, 500.0f), - 120, - Qt::NoButton, - Qt::NoModifier, - Qt::Vertical); + auto eventList = QList<QT_PREPEND_NAMESPACE(QWheelEvent)>() + << QT_PREPEND_NAMESPACE(QWheelEvent)(QPointF(500.0, 500.0), + QPointF(), QPoint(), + QPoint(0, 120), + Qt::NoButton, + Qt::NoModifier, + Qt::NoScrollPhase, + false); backendMouseDevice.updateWheelEvents(eventList); // THEN @@ -191,11 +194,14 @@ private Q_SLOTS: QCOMPARE(backendMouseDevice.sensitivity(), 0.1f); // WHEN - eventList = QList<QT_PREPEND_NAMESPACE(QWheelEvent)>() << QT_PREPEND_NAMESPACE(QWheelEvent)(QPointF(500.0f, 500.0f), - 120, - Qt::NoButton, - Qt::NoModifier, - Qt::Horizontal); + eventList = QList<QT_PREPEND_NAMESPACE(QWheelEvent)>() + << QT_PREPEND_NAMESPACE(QWheelEvent)(QPointF(500.0, 500.0), + QPointF(), QPoint(), + QPoint(120, 0), + Qt::NoButton, + Qt::NoModifier, + Qt::NoScrollPhase, + false); backendMouseDevice.updateWheelEvents(eventList); // THEN @@ -204,11 +210,13 @@ private Q_SLOTS: QCOMPARE(backendMouseDevice.sensitivity(), 0.1f); // WHEN - eventList = QList<QT_PREPEND_NAMESPACE(QWheelEvent)>() << QT_PREPEND_NAMESPACE(QWheelEvent)(QPointF(500.0f, 500.0f), - 0, - Qt::NoButton, - Qt::NoModifier, - Qt::Horizontal); + eventList = QList<QT_PREPEND_NAMESPACE(QWheelEvent)>() + << QT_PREPEND_NAMESPACE(QWheelEvent)(QPointF(500.0, 500.0), + QPointF(), QPoint(), QPoint(), + Qt::NoButton, + Qt::NoModifier, + Qt::NoScrollPhase, + false); backendMouseDevice.updateWheelEvents(eventList); // THEN |