diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-05-09 13:46:14 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-10 19:08:37 +0000 |
| commit | a3e2dcf36679a5ae9cb18fe3730d0e3dca6240d6 (patch) | |
| tree | e613d11e42484142a1c044b08035924543864c8f /src/input/frontend | |
| parent | 9927e58063c7bfcb7fedf4f0e01a672dd6ff6b24 (diff) | |
| download | qt3d-a3e2dcf36679a5ae9cb18fe3730d0e3dca6240d6.tar.gz | |
Remove ChangeFlag from NodeUpdated change type ctors
...and fix resulting compilation issues and tests.
Had to temporarily allow QNode[Added|Removed] property change to be
able to handle QVariant payloads too. This will be split out into
a separate pair of classes in a future commit.
Task-number: QTBUG-51494
Change-Id: I1748e3b8aa3c39fa171ee0c5af4204502826ba07
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/input/frontend')
| -rw-r--r-- | src/input/frontend/qabstractphysicaldevice.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/input/frontend/qabstractphysicaldevice.cpp b/src/input/frontend/qabstractphysicaldevice.cpp index f504a07ab..c340b9bf1 100644 --- a/src/input/frontend/qabstractphysicaldevice.cpp +++ b/src/input/frontend/qabstractphysicaldevice.cpp @@ -198,7 +198,7 @@ QVector<QAxisSetting *> QAbstractPhysicalDevice::axisSettings() const void QAbstractPhysicalDevicePrivate::postAxisEvent(int axis, qreal value) { Q_Q(QAbstractPhysicalDevice); - Qt3DCore::QNodePropertyChangePtr change(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, q->id())); + Qt3DCore::QNodePropertyChangePtr change(new Qt3DCore::QNodePropertyChange(Qt3DCore::QSceneChange::Node, q->id())); change->setPropertyName("axisEvent"); change->setValue(QVariant::fromValue(QPair<int, qreal>(axis, value))); notifyObservers(change); @@ -210,7 +210,7 @@ void QAbstractPhysicalDevicePrivate::postAxisEvent(int axis, qreal value) void QAbstractPhysicalDevicePrivate::postButtonEvent(int button, qreal value) { Q_Q(QAbstractPhysicalDevice); - Qt3DCore::QNodePropertyChangePtr change(new Qt3DCore::QNodePropertyChange(Qt3DCore::PropertyUpdated, Qt3DCore::QSceneChange::Node, q->id())); + Qt3DCore::QNodePropertyChangePtr change(new Qt3DCore::QNodePropertyChange(Qt3DCore::QSceneChange::Node, q->id())); change->setPropertyName("buttonEvent"); change->setValue(QVariant::fromValue(QPair<int, qreal>(button, value))); notifyObservers(change); |