diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-02-07 11:07:26 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-02-09 09:34:03 +0000 |
commit | d1271dba68f03610c27e87963653bf1600b5f659 (patch) | |
tree | 0042fb0d2e013caa6de5972137cce5d5ef68e8f2 /tests/auto/render/objectpicker | |
parent | 601ee9146676ef78f6ad486420ba9849ac44c844 (diff) |
Deliver all events by default unless marked as intermediate
This change inverts m_final flag on property change events so that
now, all events are delivered by default. The animation aspect now
marks intermediate calculated changes and these are not delivered
unless the user subscribes to them.
Change-Id: Ide6c30b29a91ed874d47c52d0ee1352f6680c3d8
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Diffstat (limited to 'tests/auto/render/objectpicker')
-rw-r--r-- | tests/auto/render/objectpicker/tst_objectpicker.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/auto/render/objectpicker/tst_objectpicker.cpp b/tests/auto/render/objectpicker/tst_objectpicker.cpp index c0e986e08..4ba57b0ad 100644 --- a/tests/auto/render/objectpicker/tst_objectpicker.cpp +++ b/tests/auto/render/objectpicker/tst_objectpicker.cpp @@ -33,7 +33,6 @@ #include <Qt3DRender/qobjectpicker.h> #include <Qt3DCore/private/qbackendnode_p.h> #include <Qt3DCore/qpropertyupdatedchange.h> -#include <Qt3DCore/private/qpropertyupdatedchangebase_p.h> #include "testpostmanarbiter.h" #include "testrenderer.h" @@ -130,7 +129,6 @@ private Q_SLOTS: QCOMPARE(arbiter.events.count(), 1); Qt3DCore::QPropertyUpdatedChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QPropertyUpdatedChange>(); QCOMPARE(change->propertyName(), "pressed"); - QCOMPARE(Qt3DCore::QPropertyUpdatedChangeBasePrivate::get(change.data())->m_isFinal, true); arbiter.events.clear(); @@ -141,7 +139,6 @@ private Q_SLOTS: QCOMPARE(arbiter.events.count(), 1); change = arbiter.events.first().staticCast<Qt3DCore::QPropertyUpdatedChange>(); QCOMPARE(change->propertyName(), "released"); - QCOMPARE(Qt3DCore::QPropertyUpdatedChangeBasePrivate::get(change.data())->m_isFinal, true); arbiter.events.clear(); @@ -152,7 +149,6 @@ private Q_SLOTS: QCOMPARE(arbiter.events.count(), 1); change = arbiter.events.first().staticCast<Qt3DCore::QPropertyUpdatedChange>(); QCOMPARE(change->propertyName(), "clicked"); - QCOMPARE(Qt3DCore::QPropertyUpdatedChangeBasePrivate::get(change.data())->m_isFinal, true); arbiter.events.clear(); @@ -163,7 +159,6 @@ private Q_SLOTS: QCOMPARE(arbiter.events.count(), 1); change = arbiter.events.first().staticCast<Qt3DCore::QPropertyUpdatedChange>(); QCOMPARE(change->propertyName(), "entered"); - QCOMPARE(Qt3DCore::QPropertyUpdatedChangeBasePrivate::get(change.data())->m_isFinal, true); arbiter.events.clear(); @@ -174,7 +169,6 @@ private Q_SLOTS: QCOMPARE(arbiter.events.count(), 1); change = arbiter.events.first().staticCast<Qt3DCore::QPropertyUpdatedChange>(); QCOMPARE(change->propertyName(), "exited"); - QCOMPARE(Qt3DCore::QPropertyUpdatedChangeBasePrivate::get(change.data())->m_isFinal, true); arbiter.events.clear(); } |