summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.qmake.conf2
-rw-r--r--dependencies.yaml13
-rw-r--r--src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp5
-rw-r--r--src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp5
-rw-r--r--src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp2
-rw-r--r--src/quick3d/imports/input/qt3dquick3dinputplugin.cpp5
-rw-r--r--src/quick3d/imports/logic/qt3dquick3dlogicplugin.cpp5
-rw-r--r--src/quick3d/imports/render/qt3dquick3drenderplugin.cpp5
-rw-r--r--src/quick3d/imports/scene2d/qtquickscene2dplugin.cpp5
-rw-r--r--src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp5
-rw-r--r--src/render/framegraph/qrendercapture.cpp4
-rw-r--r--tests/auto/input/mousedevice/tst_mousedevice.cpp38
12 files changed, 63 insertions, 31 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 89d164a2e..06c7df40b 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -7,4 +7,4 @@ DEFINES += QT_NO_FOREACH
DEFINES += QT_NO_JAVA_STYLE_ITERATORS
DEFINES += BUILD_QT3D_MODULE
-MODULE_VERSION = 5.15.0
+MODULE_VERSION = 6.0.0
diff --git a/dependencies.yaml b/dependencies.yaml
new file mode 100644
index 000000000..c06c22130
--- /dev/null
+++ b/dependencies.yaml
@@ -0,0 +1,13 @@
+dependencies:
+ ../qtbase:
+ ref: dff3843d98d52e2c32fea07371f91117de0667e9
+ required: true
+ ../qtdeclarative:
+ ref: 033e797aa5c58bb8f306f82292da272e60fa2fa1
+ required: false
+ ../qtgamepad:
+ ref: 5fe6fd206f4aef1cb1ee9c328ee27e25e6b44f4a
+ required: false
+ ../qtimageformats:
+ ref: b9b0e50aa3b7ff7c4b39bdb84e6c0b8027447fb8
+ required: false
diff --git a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp
index efb9fa706..8ca625a3e 100644
--- a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp
+++ b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp
@@ -102,8 +102,9 @@ void Qt3DQuick3DAnimationPlugin::registerTypes(const char *uri)
qmlRegisterUncreatableType<Qt3DAnimation::QAbstractChannelMapping>(uri, 2, 10, "AbstractChannelMapping", QStringLiteral("QAbstractChannelMapping is abstract"));
qmlRegisterType<Qt3DAnimation::QSkeletonMapping>(uri, 2, 10, "SkeletonMapping");
- // Auto-increment the import to stay in sync with ALL future Qt minor versions
- qmlRegisterModule(uri, 2, QT_VERSION_MINOR);
+ // The minor version used to be the current Qt 5 minor. For compatibility it is the last
+ // Qt 5 release.
+ qmlRegisterModule(uri, 2, 15);
}
QT_END_NAMESPACE
diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
index 59df221ab..75fa7b2da 100644
--- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
+++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
@@ -84,8 +84,9 @@ void Qt3DQuick3DCorePlugin::registerTypes(const char *uri)
Qt3DCore::Quick::registerExtendedType<Qt3DCore::QJoint, Qt3DCore::Quick::Quick3DJoint>("QJoint", "Qt3D.Core/Joint", uri, 2, 10, "Joint");
- // Auto-increment the import to stay in sync with ALL future Qt minor versions
- qmlRegisterModule(uri, 2, QT_VERSION_MINOR);
+ // The minor version used to be the current Qt 5 minor. For compatibility it is the last
+ // Qt 5 release.
+ qmlRegisterModule(uri, 2, 15);
}
Qt3DQuick3DCorePlugin::~Qt3DQuick3DCorePlugin()
diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
index b675ec283..387bf2ce6 100644
--- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
+++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
@@ -147,7 +147,7 @@ QT_WARNING_POP
qmlRegisterType<Qt3DExtras::QText2DEntity>(uri, 2, 9, "Text2DEntity");
// Auto-increment the import to stay in sync with ALL future Qt minor versions
- qmlRegisterModule(uri, 2, QT_VERSION_MINOR);
+ qmlRegisterModule(uri, 2, 15);
}
diff --git a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp
index ba2e0661c..46a3021ef 100644
--- a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp
+++ b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp
@@ -105,8 +105,9 @@ void Qt3DQuick3DInputPlugin::registerTypes(const char *uri)
qmlRegisterType<Qt3DInput::QGamepadInput>(uri, 2, 0, "GamepadInput");
#endif
- // Auto-increment the import to stay in sync with ALL future Qt minor versions
- qmlRegisterModule(uri, 2, QT_VERSION_MINOR);
+ // The minor version used to be the current Qt 5 minor. For compatibility it is the last
+ // Qt 5 release.
+ qmlRegisterModule(uri, 2, 15);
}
QT_END_NAMESPACE
diff --git a/src/quick3d/imports/logic/qt3dquick3dlogicplugin.cpp b/src/quick3d/imports/logic/qt3dquick3dlogicplugin.cpp
index 0fbe64002..969b28a0d 100644
--- a/src/quick3d/imports/logic/qt3dquick3dlogicplugin.cpp
+++ b/src/quick3d/imports/logic/qt3dquick3dlogicplugin.cpp
@@ -48,8 +48,9 @@ void Qt3DQuick3DLogicPlugin::registerTypes(const char *uri)
{
qmlRegisterType<Qt3DLogic::QFrameAction>(uri, 2, 0, "FrameAction");
- // Auto-increment the import to stay in sync with ALL future Qt minor versions
- qmlRegisterModule(uri, 2, QT_VERSION_MINOR);
+ // The minor version used to be the current Qt 5 minor. For compatibility it is the last
+ // Qt 5 release.
+ qmlRegisterModule(uri, 2, 15);
}
QT_END_NAMESPACE
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
index e16314c8e..947e3d2f1 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
@@ -320,8 +320,9 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri)
qmlRegisterType<Qt3DRender::QLineWidth>(uri, 2, 10, "LineWidth");
qmlRegisterType<Qt3DRender::QRasterMode>(uri, 2, 13, "RasterMode");
- // Auto-increment the import to stay in sync with ALL future Qt minor versions
- qmlRegisterModule(uri, 2, QT_VERSION_MINOR);
+ // The minor version used to be the current Qt 5 minor. For compatibility it is the last
+ // Qt 5 release.
+ qmlRegisterModule(uri, 2, 15);
}
QT_END_NAMESPACE
diff --git a/src/quick3d/imports/scene2d/qtquickscene2dplugin.cpp b/src/quick3d/imports/scene2d/qtquickscene2dplugin.cpp
index 0c410e84b..b63400ad9 100644
--- a/src/quick3d/imports/scene2d/qtquickscene2dplugin.cpp
+++ b/src/quick3d/imports/scene2d/qtquickscene2dplugin.cpp
@@ -54,8 +54,9 @@ void QtQuickScene2DPlugin::registerTypes(const char *uri)
{
qmlRegisterExtendedType<Qt3DRender::Quick::QScene2D, Qt3DRender::Render::Quick::QQuick3DScene2D>(uri, 2, 9, "Scene2D");
- // Auto-increment the import to stay in sync with ALL future Qt minor versions
- qmlRegisterModule(uri, 2, QT_VERSION_MINOR);
+ // The minor version used to be the current Qt 5 minor. For compatibility it is the last
+ // Qt 5 release.
+ qmlRegisterModule(uri, 2, 15);
}
QT_END_NAMESPACE
diff --git a/src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp b/src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp
index 00f24070e..3da9a54fc 100644
--- a/src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp
+++ b/src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp
@@ -52,8 +52,9 @@ void QtQuickScene3DPlugin::registerTypes(const char *uri)
qmlRegisterType<Qt3DRender::Scene3DItem, 14>(uri, 2, 14, "Scene3D");
qmlRegisterType<Qt3DRender::Scene3DView>(uri, 2, 14, "Scene3DView");
- // Auto-increment the import to stay in sync with ALL future Qt minor versions
- qmlRegisterModule(uri, 2, QT_VERSION_MINOR);
+ // The minor version used to be the current Qt 5 minor. For compatibility it is the last
+ // Qt 5 release.
+ qmlRegisterModule(uri, 2, 15);
}
QT_END_NAMESPACE
diff --git a/src/render/framegraph/qrendercapture.cpp b/src/render/framegraph/qrendercapture.cpp
index 3c6f90c7c..a10083374 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 f245e399d..41ecd68c7 100644
--- a/tests/auto/input/mousedevice/tst_mousedevice.cpp
+++ b/tests/auto/input/mousedevice/tst_mousedevice.cpp
@@ -177,11 +177,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
@@ -190,11 +193,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
@@ -203,11 +209,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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 16:26:45 +0000