qiurui
/
qt3d
mirror of https://github.com/qt/qt3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix deprecation handling 

Change-Id: If981333f7a3d78028d4f08c59867453d4192b955
Task-number: QTBUG-81058
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
This commit is contained in:
Mike Krus 2020-01-11 11:17:55 +00:00
parent a40654ad45
commit 0dc38ecbbf
51 changed files with 125 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.qmake.conf
View File

@ -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

1
src/animation/animation.pro
View File

@ -1,6 +1,7 @@
TARGET = Qt3DAnimation
DEFINES += QT3DANIMATION_LIBRARY
DEFINES += BUILD_QT3D_MODULE
MODULE = 3danimation

3
src/core/changes/qnodecreatedchange.h
View File

@ -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;
};

6
src/core/changes/qscenechange_p.h
View File

@ -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

5
src/core/changes/qskeletoncreatedchange_p.h
View File

@ -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

3
src/core/changes/qtypedpropertyupdatechange_p.h
View File

@ -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;
};

1
src/core/core.pro
View File

@ -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

3
src/core/nodes/qnode_p.h
View File

@ -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)

3
src/core/nodes/qnodecreatedchangegenerator_p.h
View File

@ -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;

9
src/core/qchangearbiter_p.h
View File

@ -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();

1
src/extras/extras.pro
View File

@ -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)

1
src/input/input.pro
View File

@ -1,6 +1,7 @@
TARGET = Qt3DInput
DEFINES += QT3DINPUT_LIBRARY
DEFINES += BUILD_QT3D_MODULE
MODULE = 3dinput
MODULE_PLUGIN_TYPES = 3dinputdevices

1
src/logic/logic.pro
View File

@ -1,5 +1,6 @@
TARGET = Qt3DLogic
MODULE = 3dlogic
DEFINES += BUILD_QT3D_MODULE
QT = core-private gui-private 3dcore 3dcore-private

1
src/plugins/renderplugins/scene2d/scene2d.pro
View File

@ -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

1
src/plugins/sceneparsers/assimp/assimp.pro
View File

@ -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)

1
src/plugins/sceneparsers/gltf/gltf.pro
View File

@ -1,5 +1,6 @@
TARGET = gltfsceneimport
QT += core-private 3dcore 3dcore-private 3drender 3drender-private 3dextras
DEFINES += BUILD_QT3D_MODULE
HEADERS += \
gltfimporter.h

1
src/plugins/sceneparsers/gltfexport/gltfexport.pro
View File

@ -1,5 +1,6 @@
TARGET = gltfsceneexport
QT += core-private 3dcore 3dcore-private 3drender 3drender-private 3dextras
DEFINES += BUILD_QT3D_MODULE
HEADERS += \
gltfexporter.h

1
src/quick3d/imports/animation/importsanimation.pro
View File

@ -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

1
src/quick3d/imports/core/importscore.pro
View File

@ -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

1
src/quick3d/imports/extras/importsextras.pro
View File

@ -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

1
src/quick3d/imports/input/importsinput.pro
View File

@ -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

1
src/quick3d/imports/logic/importslogic.pro
View File

@ -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

1
src/quick3d/imports/render/importsrender.pro
View File

@ -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

1
src/quick3d/imports/scene2d/importsscene2d.pro
View File

@ -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

1
src/quick3d/imports/scene3d/importsscene3d.pro
View File

@ -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

1
src/quick3d/quick3d/quick3d.pro
View File

@ -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

1
src/quick3d/quick3danimation/quick3danimation.pro
View File

@ -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

1
src/quick3d/quick3dextras/quick3dextras.pro
View File

@ -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

1
src/quick3d/quick3dinput/quick3dinput.pro
View File

@ -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

1
src/quick3d/quick3drender/quick3drender.pro
View File

@ -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

1
src/quick3d/quick3dscene2d/quick3dscene2d.pro
View File

@ -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

1
src/render/render.pro
View File

@ -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)

2
tests/auto/animation/animationutils/tst_animationutils.cpp
View File

@ -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)

9
tests/auto/core/common/qbackendnodetester.cpp
View File

@ -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

4
tests/auto/core/common/testpostmanarbiter.cpp
View File

@ -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>

3
tests/auto/core/common/testpostmanarbiter.h
View File

@ -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:

4
tests/auto/core/nodes/tst_nodes.cpp
View File

@ -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>

4
tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
View File

@ -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>

4
tests/auto/core/qentity/tst_qentity.cpp
View File

@ -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>

221
tests/auto/core/qpostman/tst_qpostman.cpp
View File

@ -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)

4
tests/auto/core/qscene/tst_qscene.cpp
View File

@ -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>

4
tests/auto/core/qtransform/tst_qtransform.cpp
View File

@ -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>

6
tests/auto/coretest/qbackendnodetester.cpp
View File

@ -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

4
tests/auto/coretest/testpostmanarbiter.cpp
View File

@ -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>

4
tests/auto/render/entity/tst_entity.cpp
View File

@ -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>

3
tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp
View File

@ -26,6 +26,9 @@
**
****************************************************************************/
// TODO Remove in Qt6
#include <QtCore/qcompilerdetection.h>
QT_WARNING_DISABLE_DEPRECATED
#include <QtTest/QTest>
#include <Qt3DRender/qabstracttexture.h>

4
tests/auto/render/qgeometry/tst_qgeometry.cpp
View File

@ -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>

3
tests/auto/render/qrendercapture/tst_qrendercapture.cpp
View File

@ -26,6 +26,9 @@
**
****************************************************************************/
// TODO Remove in Qt6
#include <QtCore/qcompilerdetection.h>
QT_WARNING_DISABLE_DEPRECATED
#include <QtTest/QTest>
#include <QtTest/QSignalSpy>

6
tests/auto/render/qsetfence/tst_qsetfence.cpp
View File

@ -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);

3
tests/auto/render/qshaderprogram/tst_qshaderprogram.cpp
View File

@ -26,6 +26,9 @@
**
****************************************************************************/
// TODO Remove in Qt6
#include <QtCore/qcompilerdetection.h>
QT_WARNING_DISABLE_DEPRECATED
#include <QtTest/QTest>
#include <Qt3DRender/qshaderprogram.h>

4
tests/auto/render/setfence/tst_setfence.cpp
View File

@ -37,7 +37,9 @@
**
****************************************************************************/
// TODO Remove in Qt6
#include <QtCore/qcompilerdetection.h>
QT_WARNING_DISABLE_DEPRECATED
#include <QtTest/QTest>
#include <Qt3DRender/qsetfence.h>