diff options
51 files changed, 125 insertions, 228 deletions
diff --git a/.qmake.conf b/.qmake.conf index 89d164a2e..21b446c03 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -5,6 +5,5 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH DEFINES += QT_NO_JAVA_STYLE_ITERATORS -DEFINES += BUILD_QT3D_MODULE MODULE_VERSION = 5.15.0 diff --git a/src/animation/animation.pro b/src/animation/animation.pro index 9c5db68f2..53d448d54 100644 --- a/src/animation/animation.pro +++ b/src/animation/animation.pro @@ -1,6 +1,7 @@ TARGET = Qt3DAnimation DEFINES += QT3DANIMATION_LIBRARY +DEFINES += BUILD_QT3D_MODULE MODULE = 3danimation diff --git a/src/core/changes/qnodecreatedchange.h b/src/core/changes/qnodecreatedchange.h index 326a83e99..31d00f3ac 100644 --- a/src/core/changes/qnodecreatedchange.h +++ b/src/core/changes/qnodecreatedchange.h @@ -71,11 +71,14 @@ template<typename T> class QNodeCreatedChange : public QNodeCreatedChangeBase { public: + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED explicit QNodeCreatedChange(const QNode *_node) : QNodeCreatedChangeBase(_node) , data() { } + QT_WARNING_POP T data; }; diff --git a/src/core/changes/qscenechange_p.h b/src/core/changes/qscenechange_p.h index 32006807c..4e112fe93 100644 --- a/src/core/changes/qscenechange_p.h +++ b/src/core/changes/qscenechange_p.h @@ -63,12 +63,15 @@ namespace Qt3DCore { class QSceneChange; class QNodeId; +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED struct NodeRelationshipChange { QNode *node; QNode *subNode; ChangeFlag change; const char *property; }; +QT_WARNING_POP class Q_3DCORE_PRIVATE_EXPORT QSceneChangePrivate { @@ -82,7 +85,10 @@ public : QNodeId m_subjectId; QSceneChange::DeliveryFlags m_deliveryFlags; + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED ChangeFlag m_type; + QT_WARNING_POP }; } // Qt3D diff --git a/src/core/changes/qskeletoncreatedchange_p.h b/src/core/changes/qskeletoncreatedchange_p.h index c20bcae85..9f0c361da 100644 --- a/src/core/changes/qskeletoncreatedchange_p.h +++ b/src/core/changes/qskeletoncreatedchange_p.h @@ -80,17 +80,20 @@ template<typename T> class QSkeletonCreatedChange : public QSkeletonCreatedChangeBase { public: + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED explicit QSkeletonCreatedChange(const QAbstractSkeleton *_skeleton) : QSkeletonCreatedChangeBase(_skeleton) , data() { } + QT_WARNING_POP T data; }; template<typename T> -using QSkeletonCreatedChangePtr Q3D_DECL_DEPRECATED = QSharedPointer<QSkeletonCreatedChange<T>>; +using QSkeletonCreatedChangePtr = QSharedPointer<QSkeletonCreatedChange<T>>; } // namespace Qt3DCore diff --git a/src/core/changes/qtypedpropertyupdatechange_p.h b/src/core/changes/qtypedpropertyupdatechange_p.h index f196ee5eb..6793144ca 100644 --- a/src/core/changes/qtypedpropertyupdatechange_p.h +++ b/src/core/changes/qtypedpropertyupdatechange_p.h @@ -61,11 +61,14 @@ template<typename T> class QTypedPropertyUpdatedChange : public QStaticPropertyUpdatedChangeBase { public: + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED explicit QTypedPropertyUpdatedChange(QNodeId _subjectId) : QStaticPropertyUpdatedChangeBase(_subjectId) , data() { } + QT_WARNING_POP T data; }; diff --git a/src/core/core.pro b/src/core/core.pro index b1ba54be2..b76198e35 100644 --- a/src/core/core.pro +++ b/src/core/core.pro @@ -2,6 +2,7 @@ TARGET = Qt3DCore MODULE = 3dcore QT = core-private gui-private network +DEFINES += BUILD_QT3D_MODULE gcov { QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage diff --git a/src/core/nodes/qnode_p.h b/src/core/nodes/qnode_p.h index 61aa81c81..5aa4c5328 100644 --- a/src/core/nodes/qnode_p.h +++ b/src/core/nodes/qnode_p.h @@ -90,7 +90,10 @@ public: void updatePropertyTrackMode(); void update(); + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED void updateNode(QNode *node, const char* property, ChangeFlag change); + QT_WARNING_POP Q_DECLARE_PUBLIC(QNode) diff --git a/src/core/nodes/qnodecreatedchangegenerator_p.h b/src/core/nodes/qnodecreatedchangegenerator_p.h index b2e8fa08b..35e5b673e 100644 --- a/src/core/nodes/qnodecreatedchangegenerator_p.h +++ b/src/core/nodes/qnodecreatedchangegenerator_p.h @@ -69,6 +69,8 @@ public: private: void createCreationChange(QNode *node) { + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED const auto creationChange = node->createNodeCreationChange(); m_creationChanges.push_back(creationChange); @@ -82,6 +84,7 @@ private: // Mark this node as having been handled for creation so that it is picked up d->m_hasBackendNode = true; + QT_WARNING_POP } QVector<QNodeCreatedChangeBasePtr> m_creationChanges; diff --git a/src/core/qchangearbiter_p.h b/src/core/qchangearbiter_p.h index 7d48c390a..483b46575 100644 --- a/src/core/qchangearbiter_p.h +++ b/src/core/qchangearbiter_p.h @@ -84,7 +84,10 @@ public: virtual QAbstractPostman *postman() const = 0; virtual void addDirtyFrontEndNode(QNode *node) = 0; virtual void removeDirtyFrontEndNode(QNode *node) = 0; + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED virtual void addDirtyFrontEndNode(QNode *node, QNode *subNode, const char *property, ChangeFlag change) = 0; + QT_WARNING_POP }; class Q_3DCORE_PRIVATE_EXPORT QChangeArbiter final @@ -100,9 +103,12 @@ public: void syncChanges(); + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED void registerObserver(QObserverInterface *observer, QNodeId nodeId, ChangeFlags changeFlags = AllChanges); + QT_WARNING_POP void unregisterObserver(QObserverInterface *observer, QNodeId nodeId); @@ -111,7 +117,10 @@ public: void sceneChangeEventWithLock(const QSceneChangeList &e) override; // QLockableObserverInterface impl void addDirtyFrontEndNode(QNode *node) override; + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED void addDirtyFrontEndNode(QNode *node, QNode *subNode, const char *property, ChangeFlag change) override; + QT_WARNING_POP void removeDirtyFrontEndNode(QNode *node) override; QVector<QNode *> takeDirtyFrontEndNodes(); QVector<NodeRelationshipChange> takeDirtyFrontEndSubNodes(); diff --git a/src/extras/extras.pro b/src/extras/extras.pro index 396c9aa91..172e98881 100644 --- a/src/extras/extras.pro +++ b/src/extras/extras.pro @@ -3,6 +3,7 @@ MODULE = 3dextras QT += core-private 3dcore 3dcore-private 3drender 3drender-private 3dinput 3dlogic DEFINES += QT3DEXTRAS_LIBRARY +DEFINES += BUILD_QT3D_MODULE load(qt_module) diff --git a/src/input/input.pro b/src/input/input.pro index 938e77643..9596d092a 100644 --- a/src/input/input.pro +++ b/src/input/input.pro @@ -1,6 +1,7 @@ TARGET = Qt3DInput DEFINES += QT3DINPUT_LIBRARY +DEFINES += BUILD_QT3D_MODULE MODULE = 3dinput MODULE_PLUGIN_TYPES = 3dinputdevices diff --git a/src/logic/logic.pro b/src/logic/logic.pro index 0fa0f8d55..ac744a6bb 100644 --- a/src/logic/logic.pro +++ b/src/logic/logic.pro @@ -1,5 +1,6 @@ TARGET = Qt3DLogic MODULE = 3dlogic +DEFINES += BUILD_QT3D_MODULE QT = core-private gui-private 3dcore 3dcore-private diff --git a/src/plugins/renderplugins/scene2d/scene2d.pro b/src/plugins/renderplugins/scene2d/scene2d.pro index 2cb07756b..9f6ea4cf9 100644 --- a/src/plugins/renderplugins/scene2d/scene2d.pro +++ b/src/plugins/renderplugins/scene2d/scene2d.pro @@ -1,5 +1,6 @@ TARGET = scene2d QT += core-private 3dcore 3dcore-private 3drender 3drender-private 3dextras 3dquickscene2d 3dquickscene2d-private +DEFINES += BUILD_QT3D_MODULE HEADERS += \ scene2dplugin.h diff --git a/src/plugins/sceneparsers/assimp/assimp.pro b/src/plugins/sceneparsers/assimp/assimp.pro index f761db12e..e514b7d6f 100644 --- a/src/plugins/sceneparsers/assimp/assimp.pro +++ b/src/plugins/sceneparsers/assimp/assimp.pro @@ -1,5 +1,6 @@ TARGET = assimpsceneimport QT += core-private 3dcore 3dcore-private 3drender 3drender-private 3dextras 3danimation +DEFINES += BUILD_QT3D_MODULE include(../../../3rdparty/assimp/assimp_dependency.pri) diff --git a/src/plugins/sceneparsers/gltf/gltf.pro b/src/plugins/sceneparsers/gltf/gltf.pro index 8f0cc2fe0..46cc4069f 100644 --- a/src/plugins/sceneparsers/gltf/gltf.pro +++ b/src/plugins/sceneparsers/gltf/gltf.pro @@ -1,5 +1,6 @@ TARGET = gltfsceneimport QT += core-private 3dcore 3dcore-private 3drender 3drender-private 3dextras +DEFINES += BUILD_QT3D_MODULE HEADERS += \ gltfimporter.h diff --git a/src/plugins/sceneparsers/gltfexport/gltfexport.pro b/src/plugins/sceneparsers/gltfexport/gltfexport.pro index 9da330605..0decf20b8 100644 --- a/src/plugins/sceneparsers/gltfexport/gltfexport.pro +++ b/src/plugins/sceneparsers/gltfexport/gltfexport.pro @@ -1,5 +1,6 @@ TARGET = gltfsceneexport QT += core-private 3dcore 3dcore-private 3drender 3drender-private 3dextras +DEFINES += BUILD_QT3D_MODULE HEADERS += \ gltfexporter.h diff --git a/src/quick3d/imports/animation/importsanimation.pro b/src/quick3d/imports/animation/importsanimation.pro index 734c5186b..a5eab0e9a 100644 --- a/src/quick3d/imports/animation/importsanimation.pro +++ b/src/quick3d/imports/animation/importsanimation.pro @@ -2,6 +2,7 @@ CXX_MODULE = qml TARGET = quick3danimationplugin TARGETPATH = Qt3D/Animation IMPORT_VERSION = 2.$$QT_MINOR_VERSION +DEFINES += BUILD_QT3D_MODULE QT += core-private qml qml-private 3dcore 3drender 3danimation 3dquick 3dquickrender 3dquickanimation 3dquick-private 3dquickanimation-private diff --git a/src/quick3d/imports/core/importscore.pro b/src/quick3d/imports/core/importscore.pro index 9ba6ac66d..d7ac8c4b9 100644 --- a/src/quick3d/imports/core/importscore.pro +++ b/src/quick3d/imports/core/importscore.pro @@ -2,6 +2,7 @@ CXX_MODULE = qml TARGET = quick3dcoreplugin TARGETPATH = Qt3D/Core IMPORT_VERSION = 2.$$QT_MINOR_VERSION +DEFINES += BUILD_QT3D_MODULE QT += core-private qml qml-private quick quick-private 3dcore 3dcore-private 3dquick 3dquick-private diff --git a/src/quick3d/imports/extras/importsextras.pro b/src/quick3d/imports/extras/importsextras.pro index 1ac629422..ec51b17e1 100644 --- a/src/quick3d/imports/extras/importsextras.pro +++ b/src/quick3d/imports/extras/importsextras.pro @@ -2,6 +2,7 @@ CXX_MODULE = qml TARGET = quick3dextrasplugin TARGETPATH = Qt3D/Extras IMPORT_VERSION = 2.$$QT_MINOR_VERSION +DEFINES += BUILD_QT3D_MODULE QT += core-private qml qml-private quick quick-private 3dcore 3dcore-private 3dquick 3dquick-private 3dextras 3dlogic 3dquickextras 3dquickextras-private diff --git a/src/quick3d/imports/input/importsinput.pro b/src/quick3d/imports/input/importsinput.pro index ec333f992..a431e6c6e 100644 --- a/src/quick3d/imports/input/importsinput.pro +++ b/src/quick3d/imports/input/importsinput.pro @@ -2,6 +2,7 @@ CXX_MODULE = qml TARGET = quick3dinputplugin TARGETPATH = Qt3D/Input IMPORT_VERSION = 2.$$QT_MINOR_VERSION +DEFINES += BUILD_QT3D_MODULE QT += core-private qml 3dcore 3dinput 3dinput-private 3dquickinput-private diff --git a/src/quick3d/imports/logic/importslogic.pro b/src/quick3d/imports/logic/importslogic.pro index 2fc2accc5..74528ccb1 100644 --- a/src/quick3d/imports/logic/importslogic.pro +++ b/src/quick3d/imports/logic/importslogic.pro @@ -2,6 +2,7 @@ CXX_MODULE = qml TARGET = quick3dlogicplugin TARGETPATH = Qt3D/Logic IMPORT_VERSION = 2.$$QT_MINOR_VERSION +DEFINES += BUILD_QT3D_MODULE QT += core-private qml 3dcore 3dlogic diff --git a/src/quick3d/imports/render/importsrender.pro b/src/quick3d/imports/render/importsrender.pro index 977668c40..dd43205cf 100644 --- a/src/quick3d/imports/render/importsrender.pro +++ b/src/quick3d/imports/render/importsrender.pro @@ -2,6 +2,7 @@ CXX_MODULE = qml TARGET = quick3drenderplugin TARGETPATH = Qt3D/Render IMPORT_VERSION = 2.$$QT_MINOR_VERSION +DEFINES += BUILD_QT3D_MODULE QT += core-private qml qml-private 3dcore 3drender 3drender-private 3dquick 3dquick-private 3dquickrender-private diff --git a/src/quick3d/imports/scene2d/importsscene2d.pro b/src/quick3d/imports/scene2d/importsscene2d.pro index cb87f4ca9..828bbcadb 100644 --- a/src/quick3d/imports/scene2d/importsscene2d.pro +++ b/src/quick3d/imports/scene2d/importsscene2d.pro @@ -2,6 +2,7 @@ CXX_MODULE = qml TARGET = qtquickscene2dplugin TARGETPATH = QtQuick/Scene2D IMPORT_VERSION = 2.$$QT_MINOR_VERSION +DEFINES += BUILD_QT3D_MODULE QT += qml quick 3dcore 3drender 3drender-private 3dinput 3dlogic 3dquickscene2d 3dquickscene2d-private diff --git a/src/quick3d/imports/scene3d/importsscene3d.pro b/src/quick3d/imports/scene3d/importsscene3d.pro index e29f7b831..6bf4f5d91 100644 --- a/src/quick3d/imports/scene3d/importsscene3d.pro +++ b/src/quick3d/imports/scene3d/importsscene3d.pro @@ -2,6 +2,7 @@ CXX_MODULE = qml TARGET = qtquickscene3dplugin TARGETPATH = QtQuick/Scene3D IMPORT_VERSION = 2.$$QT_MINOR_VERSION +DEFINES += BUILD_QT3D_MODULE QT += qml quick 3dcore 3drender 3drender-private diff --git a/src/quick3d/quick3d/quick3d.pro b/src/quick3d/quick3d/quick3d.pro index b7edec507..7fefe2dc2 100644 --- a/src/quick3d/quick3d/quick3d.pro +++ b/src/quick3d/quick3d/quick3d.pro @@ -1,5 +1,6 @@ TARGET = Qt3DQuick MODULE = 3dquick +DEFINES += BUILD_QT3D_MODULE QT += core-private gui-private qml qml-private quick quick-private 3dcore 3dcore-private diff --git a/src/quick3d/quick3danimation/quick3danimation.pro b/src/quick3d/quick3danimation/quick3danimation.pro index 4b166327f..483f4994c 100644 --- a/src/quick3d/quick3danimation/quick3danimation.pro +++ b/src/quick3d/quick3danimation/quick3danimation.pro @@ -1,5 +1,6 @@ TARGET = Qt3DQuickAnimation MODULE = 3dquickanimation +DEFINES += BUILD_QT3D_MODULE QT += core core-private qml qml-private 3dcore 3drender 3danimation 3dquick 3dquick-private 3dcore-private 3drender-private CONFIG -= precompile_header diff --git a/src/quick3d/quick3dextras/quick3dextras.pro b/src/quick3d/quick3dextras/quick3dextras.pro index f7c956f8a..40de4484a 100644 --- a/src/quick3d/quick3dextras/quick3dextras.pro +++ b/src/quick3d/quick3dextras/quick3dextras.pro @@ -1,5 +1,6 @@ TARGET = Qt3DQuickExtras MODULE = 3dquickextras +DEFINES += BUILD_QT3D_MODULE QT += core core-private qml qml-private 3dcore 3dinput 3dquick 3dquick-private 3drender 3drender-private 3dlogic 3dextras diff --git a/src/quick3d/quick3dinput/quick3dinput.pro b/src/quick3d/quick3dinput/quick3dinput.pro index e797f3fae..491346816 100644 --- a/src/quick3d/quick3dinput/quick3dinput.pro +++ b/src/quick3d/quick3dinput/quick3dinput.pro @@ -1,5 +1,6 @@ TARGET = Qt3DQuickInput MODULE = 3dquickinput +DEFINES += BUILD_QT3D_MODULE QT += core core-private qml qml-private 3dcore 3dinput 3dquick 3dquick-private 3dcore-private 3dinput-private CONFIG -= precompile_header diff --git a/src/quick3d/quick3drender/quick3drender.pro b/src/quick3d/quick3drender/quick3drender.pro index 4c158a7b7..04eac6a16 100644 --- a/src/quick3d/quick3drender/quick3drender.pro +++ b/src/quick3d/quick3drender/quick3drender.pro @@ -1,5 +1,6 @@ TARGET = Qt3DQuickRender MODULE = 3dquickrender +DEFINES += BUILD_QT3D_MODULE QT += core core-private qml qml-private 3dcore 3drender 3dquick 3dquick-private 3dcore-private 3drender-private CONFIG -= precompile_header diff --git a/src/quick3d/quick3dscene2d/quick3dscene2d.pro b/src/quick3d/quick3dscene2d/quick3dscene2d.pro index b0596e8de..d807fe923 100644 --- a/src/quick3d/quick3dscene2d/quick3dscene2d.pro +++ b/src/quick3d/quick3dscene2d/quick3dscene2d.pro @@ -1,5 +1,6 @@ TARGET = Qt3DQuickScene2D MODULE = 3dquickscene2d +DEFINES += BUILD_QT3D_MODULE QT += core core-private qml qml-private 3dcore 3drender 3dquick 3dquick-private 3dcore-private 3drender-private CONFIG -= precompile_header diff --git a/src/render/render.pro b/src/render/render.pro index 55303fa83..f8d44151f 100644 --- a/src/render/render.pro +++ b/src/render/render.pro @@ -4,6 +4,7 @@ MODULE = 3drender QT = core-private gui-private 3dcore-private QT_PRIVATE = openglextensions QT_FOR_PRIVATE = concurrent +DEFINES += BUILD_QT3D_MODULE include (backend/render-backend.pri) include (geometry/geometry.pri) diff --git a/tests/auto/animation/animationutils/tst_animationutils.cpp b/tests/auto/animation/animationutils/tst_animationutils.cpp index 463656557..05558192d 100644 --- a/tests/auto/animation/animationutils/tst_animationutils.cpp +++ b/tests/auto/animation/animationutils/tst_animationutils.cpp @@ -38,7 +38,6 @@ #include <Qt3DAnimation/private/additiveclipblend_p.h> #include <Qt3DAnimation/private/lerpclipblend_p.h> #include <Qt3DAnimation/private/managers_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <QtGui/qvector2d.h> #include <QtGui/qvector3d.h> #include <QtGui/qvector4d.h> @@ -57,7 +56,6 @@ Q_DECLARE_METATYPE(Clock *) Q_DECLARE_METATYPE(ChannelMapper *) Q_DECLARE_METATYPE(AnimationClip *) Q_DECLARE_METATYPE(QVector<MappingData>) -Q_DECLARE_METATYPE(QVector<Qt3DCore::QPropertyUpdatedChangePtr>) Q_DECLARE_METATYPE(Channel) Q_DECLARE_METATYPE(AnimatorEvaluationData) Q_DECLARE_METATYPE(ClipEvaluationData) diff --git a/tests/auto/core/common/qbackendnodetester.cpp b/tests/auto/core/common/qbackendnodetester.cpp index a2685f556..13f4683d9 100644 --- a/tests/auto/core/common/qbackendnodetester.cpp +++ b/tests/auto/core/common/qbackendnodetester.cpp @@ -56,20 +56,29 @@ void QBackendNodeTester::simulateInitialization(QNode *frontend, QBackendNode *b { Q_ASSERT(frontend); Q_ASSERT(backend); + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED const auto change = frontend->createNodeCreationChange(); backend->setPeerId(change->subjectId()); backend->setEnabled(change->isNodeEnabled()); backend->initializeFromPeer(change); + QT_WARNING_POP } void QBackendNodeTester::sceneChangeEvent(QBackendNode *backend, const Qt3DCore::QSceneChangePtr &e) { + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED backend->sceneChangeEvent(e); + QT_WARNING_POP } QNodeCreatedChangeBasePtr QBackendNodeTester::creationChange(QNode *frontend) const { + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED return frontend->createNodeCreationChange(); + QT_WARNING_POP } } // namespace Qt3DCore diff --git a/tests/auto/core/common/testpostmanarbiter.cpp b/tests/auto/core/common/testpostmanarbiter.cpp index 5869cbad3..f0c362744 100644 --- a/tests/auto/core/common/testpostmanarbiter.cpp +++ b/tests/auto/core/common/testpostmanarbiter.cpp @@ -26,6 +26,10 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED + #include "testpostmanarbiter.h" #include <Qt3DCore/private/qnode_p.h> diff --git a/tests/auto/core/common/testpostmanarbiter.h b/tests/auto/core/common/testpostmanarbiter.h index cecc24f93..e927c2489 100644 --- a/tests/auto/core/common/testpostmanarbiter.h +++ b/tests/auto/core/common/testpostmanarbiter.h @@ -70,7 +70,10 @@ public: void setArbiterOnNode(Qt3DCore::QNode *node); void addDirtyFrontEndNode(Qt3DCore::QNode *node) final; + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED void addDirtyFrontEndNode(Qt3DCore::QNode *node, Qt3DCore::QNode *subNode, const char *property, Qt3DCore::ChangeFlag change) final; + QT_WARNING_POP void removeDirtyFrontEndNode(Qt3DCore::QNode *node) final; private: diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp index 87f66bab2..2e74acd61 100644 --- a/tests/auto/core/nodes/tst_nodes.cpp +++ b/tests/auto/core/nodes/tst_nodes.cpp @@ -26,6 +26,10 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED + #include <QtTest/QTest> #include <Qt3DCore/qnode.h> #include <Qt3DCore/qentity.h> diff --git a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp index e54193398..3e9b24408 100644 --- a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp +++ b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp @@ -26,6 +26,10 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED + #include <QtTest/QTest> #include <Qt3DCore/private/qobserverinterface_p.h> #include <Qt3DCore/private/qobservableinterface_p.h> diff --git a/tests/auto/core/qentity/tst_qentity.cpp b/tests/auto/core/qentity/tst_qentity.cpp index 7770a2632..7b41c9783 100644 --- a/tests/auto/core/qentity/tst_qentity.cpp +++ b/tests/auto/core/qentity/tst_qentity.cpp @@ -26,6 +26,10 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED + #include <QtTest/QtTest> #include <Qt3DCore/qentity.h> #include <Qt3DCore/private/qentity_p.h> diff --git a/tests/auto/core/qpostman/tst_qpostman.cpp b/tests/auto/core/qpostman/tst_qpostman.cpp index f548d38fa..d0dfa0f49 100644 --- a/tests/auto/core/qpostman/tst_qpostman.cpp +++ b/tests/auto/core/qpostman/tst_qpostman.cpp @@ -86,227 +86,6 @@ private Q_SLOTS: QCOMPARE(QPostmanPrivate::get(&postman)->m_scene, &scene); } - void checkSceneChangeEvent() - { - // GIVEN - QScopedPointer<QScene> scene(new QScene); - QPostman postman; - TestArbiter arbiter; - QNode rootNode; - NodeChangeReceiver *receiverNode = new NodeChangeReceiver(); - - QNodePrivate::get(&rootNode)->m_scene = scene.data(); - scene->setArbiter(&arbiter); - postman.setScene(scene.data()); - // Setting the parent (which has a scene) adds the node into the observable lookup - // table of the scene which is needed by the postman to distribute changes - static_cast<QNode *>(receiverNode)->setParent(&rootNode); - QCoreApplication::processEvents(); - - // THEN - QCOMPARE(receiverNode->hasReceivedChange(), false); - QCOMPARE(QNodePrivate::get(receiverNode)->m_scene, scene.data()); - - // WHEN - QPropertyUpdatedChangePtr updateChange(new QPropertyUpdatedChange(receiverNode->id())); - updateChange->setValue(1584); - updateChange->setPropertyName("someName"); - postman.sceneChangeEvent(updateChange); - QCoreApplication::processEvents(); - - // THEN - QCOMPARE(receiverNode->hasReceivedChange(), true); - } - - void checkNotifyBackend() - { - // GIVEN - QScopedPointer<QScene> scene(new QScene); - QPostman postman; - TestArbiter arbiter; - - scene->setArbiter(&arbiter); - postman.setScene(scene.data()); - - // THEN - QCOMPARE(arbiter.events.size(), 0); - - // WHEN - QPropertyUpdatedChangePtr updateChange(new QPropertyUpdatedChange(QNodeId())); - updateChange->setValue(1584); - updateChange->setPropertyName("someName"); - postman.notifyBackend(updateChange); - - QCoreApplication::processEvents(); - - // THEN - QCOMPARE(arbiter.events.size(), 1); - } - - void checkShouldNotifyFrontend() - { - // GIVEN - QScopedPointer<QScene> scene(new QScene); - QPostman postman; - TestArbiter arbiter; - QNode rootNode; - NodeChangeReceiver *receiverNode = new NodeChangeReceiver(); - - QNodePrivate::get(&rootNode)->m_scene = scene.data(); - scene->setArbiter(&arbiter); - postman.setScene(scene.data()); - // Setting the parent (which has a scene) adds the node into the observable lookup - // table of the scene which is needed by the postman to distribute changes - static_cast<QNode *>(receiverNode)->setParent(&rootNode); - QCoreApplication::processEvents(); - - { - // WHEN - auto updateChange = QPropertyUpdatedChangePtr::create(receiverNode->id()); - updateChange->setValue(1584); - updateChange->setPropertyName("someName"); - - - // THEN -> we do track properties by default QNode::DefaultTrackMode - // (unless marked as an intermediate change) - QCOMPARE(postman.shouldNotifyFrontend(updateChange), true); - } - - { - // WHEN - receiverNode->setDefaultPropertyTrackingMode(QNode::TrackAllValues); - - auto updateChange = QPropertyUpdatedChangePtr::create(receiverNode->id()); - updateChange->setValue(1584); - updateChange->setPropertyName("someName"); - QPropertyUpdatedChangeBasePrivate::get(updateChange.data())->m_isIntermediate - = true; - - // THEN -> we do track properties marked as intermediate when - // using TrackAllPropertiesMode - QCOMPARE(postman.shouldNotifyFrontend(updateChange), true); - } - - { - // GIVEN - receiverNode->setDefaultPropertyTrackingMode(QNode::DontTrackValues); - receiverNode->setPropertyTracking(QStringLiteral("vette"), Qt3DCore::QNode::TrackAllValues); - - { - // WHEN - auto updateChange = QPropertyUpdatedChangePtr::create(receiverNode->id()); - updateChange->setValue(1584); - updateChange->setPropertyName("someName"); - QPropertyUpdatedChangeBasePrivate::get(updateChange.data())->m_isIntermediate - = true; - - // THEN -> we don't track properties by default, unless named when - // using TrackNamedPropertiesMode - QCOMPARE(postman.shouldNotifyFrontend(updateChange), false); - } - - { - // WHEN - auto updateChange = QPropertyUpdatedChangePtr::create(receiverNode->id()); - updateChange->setValue(1584); - updateChange->setPropertyName("vette"); - QPropertyUpdatedChangeBasePrivate::get(updateChange.data())->m_isIntermediate - = true; - - // THEN - QCOMPARE(postman.shouldNotifyFrontend(updateChange), true); - } - } - - { - // GIVEN - receiverNode->setPropertyTracking(QStringLiteral("vette"), Qt3DCore::QNode::TrackAllValues); - receiverNode->setDefaultPropertyTrackingMode(QNode::TrackAllValues); - - { - // WHEN - auto updateChange = QPropertyUpdatedChangePtr::create(receiverNode->id()); - updateChange->setValue(1584); - updateChange->setPropertyName("someName"); - - // THEN -> we don't track properties by default - QCOMPARE(postman.shouldNotifyFrontend(updateChange), true); - } - - { - // WHEN - auto updateChange = QPropertyUpdatedChangePtr::create(receiverNode->id()); - updateChange->setValue(1584); - updateChange->setPropertyName("vette"); - - // THEN -> we don't track properties by default - QCOMPARE(postman.shouldNotifyFrontend(updateChange), true); - } - } - - { - // GIVEN - receiverNode->clearPropertyTrackings(); - receiverNode->setDefaultPropertyTrackingMode(QNode::TrackFinalValues); - - { - // WHEN - auto updateChange = QPropertyUpdatedChangePtr::create(receiverNode->id()); - updateChange->setValue(1584); - updateChange->setPropertyName("someName"); - - // THEN -> we do track properties by default, unless marked as intermediate - QCOMPARE(postman.shouldNotifyFrontend(updateChange), true); - } - - { - // WHEN - auto addedChange - = QPropertyNodeAddedChangePtr::create(receiverNode->id(), receiverNode); - - // THEN -> only QPropertyUpdatedChangePtr are filtered - QCOMPARE(postman.shouldNotifyFrontend(addedChange), true); - } - { - // WHEN - auto removedChange - = QPropertyNodeRemovedChangePtr::create(receiverNode->id(), receiverNode); - - // THEN -> only QPropertyUpdatedChangePtr are filtered - QCOMPARE(postman.shouldNotifyFrontend(removedChange), true); - } - } - - { - // GIVEN - receiverNode->clearPropertyTrackings(); - receiverNode->setDefaultPropertyTrackingMode(QNode::TrackFinalValues); - - { - // WHEN - auto updateChange = QPropertyUpdatedChangePtr::create(receiverNode->id()); - updateChange->setValue(1584); - updateChange->setPropertyName("someName"); - QPropertyUpdatedChangeBasePrivate::get(updateChange.data())->m_isIntermediate - = true; - - // THEN -> we don't track intermediate properties by default - QCOMPARE(postman.shouldNotifyFrontend(updateChange), false); - } - - { - // WHEN - auto updateChange = QPropertyUpdatedChangePtr::create(receiverNode->id()); - updateChange->setValue(1584); - updateChange->setPropertyName("someName"); - - // THEN - QCOMPARE(postman.shouldNotifyFrontend(updateChange), true); - } - - } - } - }; QTEST_MAIN(tst_QPostman) diff --git a/tests/auto/core/qscene/tst_qscene.cpp b/tests/auto/core/qscene/tst_qscene.cpp index ecc72e992..eb6a8c5ec 100644 --- a/tests/auto/core/qscene/tst_qscene.cpp +++ b/tests/auto/core/qscene/tst_qscene.cpp @@ -26,6 +26,10 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED + #include <QtTest/QtTest> #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qnode.h> diff --git a/tests/auto/core/qtransform/tst_qtransform.cpp b/tests/auto/core/qtransform/tst_qtransform.cpp index 37848ffd6..18a906e4c 100644 --- a/tests/auto/core/qtransform/tst_qtransform.cpp +++ b/tests/auto/core/qtransform/tst_qtransform.cpp @@ -26,6 +26,10 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED + #include <QtTest/QtTest> #include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qtransform.h> diff --git a/tests/auto/coretest/qbackendnodetester.cpp b/tests/auto/coretest/qbackendnodetester.cpp index be9767828..bd5fb85d1 100644 --- a/tests/auto/coretest/qbackendnodetester.cpp +++ b/tests/auto/coretest/qbackendnodetester.cpp @@ -57,15 +57,21 @@ void QBackendNodeTester::simulateInitialization(QNode *frontend, QBackendNode *b { Q_ASSERT(frontend); Q_ASSERT(backend); + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED const auto change = frontend->createNodeCreationChange(); backend->setPeerId(change->subjectId()); backend->setEnabled(change->isNodeEnabled()); backend->initializeFromPeer(change); + QT_WARNING_POP } void QBackendNodeTester::sceneChangeEvent(QBackendNode *backend, const Qt3DCore::QSceneChangePtr &e) { + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED backend->sceneChangeEvent(e); + QT_WARNING_POP } } // namespace Qt3DCore diff --git a/tests/auto/coretest/testpostmanarbiter.cpp b/tests/auto/coretest/testpostmanarbiter.cpp index d1263b8f7..d2e404809 100644 --- a/tests/auto/coretest/testpostmanarbiter.cpp +++ b/tests/auto/coretest/testpostmanarbiter.cpp @@ -26,6 +26,10 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED + #include "testpostmanarbiter_p.h" #include <Qt3DCore/private/qnode_p.h> diff --git a/tests/auto/render/entity/tst_entity.cpp b/tests/auto/render/entity/tst_entity.cpp index 93f2614b8..2629e6953 100644 --- a/tests/auto/render/entity/tst_entity.cpp +++ b/tests/auto/render/entity/tst_entity.cpp @@ -26,6 +26,10 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED + #include <QtTest/QtTest> #include <Qt3DRender/private/entity_p.h> #include <Qt3DRender/private/entity_p_p.h> diff --git a/tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp b/tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp index a1973176e..6fad09a0d 100644 --- a/tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp +++ b/tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp @@ -26,6 +26,9 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED #include <QtTest/QTest> #include <Qt3DRender/qabstracttexture.h> diff --git a/tests/auto/render/qgeometry/tst_qgeometry.cpp b/tests/auto/render/qgeometry/tst_qgeometry.cpp index 017314ecf..e790ba9cc 100644 --- a/tests/auto/render/qgeometry/tst_qgeometry.cpp +++ b/tests/auto/render/qgeometry/tst_qgeometry.cpp @@ -26,6 +26,10 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED + #include <QtTest/QTest> #include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/private/qnode_p.h> diff --git a/tests/auto/render/qrendercapture/tst_qrendercapture.cpp b/tests/auto/render/qrendercapture/tst_qrendercapture.cpp index 9ed7651fc..35c645d41 100644 --- a/tests/auto/render/qrendercapture/tst_qrendercapture.cpp +++ b/tests/auto/render/qrendercapture/tst_qrendercapture.cpp @@ -26,6 +26,9 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED #include <QtTest/QTest> #include <QtTest/QSignalSpy> diff --git a/tests/auto/render/qsetfence/tst_qsetfence.cpp b/tests/auto/render/qsetfence/tst_qsetfence.cpp index c602e6f5c..ad92e9fe0 100644 --- a/tests/auto/render/qsetfence/tst_qsetfence.cpp +++ b/tests/auto/render/qsetfence/tst_qsetfence.cpp @@ -37,6 +37,10 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED + #include <QtTest/QTest> #include <Qt3DRender/qsetfence.h> #include <Qt3DRender/private/qsetfence_p.h> @@ -153,7 +157,6 @@ private Q_SLOTS: QCOMPARE(creationChanges.size(), 1); const auto creationChangeData = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DRender::QSetFenceData>>(creationChanges.first()); - const Qt3DRender::QSetFenceData cloneData = creationChangeData->data; QCOMPARE(setFence.id(), creationChangeData->subjectId()); QCOMPARE(setFence.isEnabled(), true); @@ -174,7 +177,6 @@ private Q_SLOTS: QCOMPARE(creationChanges.size(), 1); const auto creationChangeData = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<Qt3DRender::QSetFenceData>>(creationChanges.first()); - const Qt3DRender::QSetFenceData cloneData = creationChangeData->data; QCOMPARE(setFence.id(), creationChangeData->subjectId()); QCOMPARE(setFence.isEnabled(), false); diff --git a/tests/auto/render/qshaderprogram/tst_qshaderprogram.cpp b/tests/auto/render/qshaderprogram/tst_qshaderprogram.cpp index a261d0860..18dd1306a 100644 --- a/tests/auto/render/qshaderprogram/tst_qshaderprogram.cpp +++ b/tests/auto/render/qshaderprogram/tst_qshaderprogram.cpp @@ -26,6 +26,9 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED #include <QtTest/QTest> #include <Qt3DRender/qshaderprogram.h> diff --git a/tests/auto/render/setfence/tst_setfence.cpp b/tests/auto/render/setfence/tst_setfence.cpp index 92f7a0acc..75c414e7f 100644 --- a/tests/auto/render/setfence/tst_setfence.cpp +++ b/tests/auto/render/setfence/tst_setfence.cpp @@ -37,7 +37,9 @@ ** ****************************************************************************/ - +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED #include <QtTest/QTest> #include <Qt3DRender/qsetfence.h> |