summaryrefslogtreecommitdiffstats
path: root/src/input/backend/action.cpp
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2017-05-24 12:09:44 +0100
committerSean Harmer <sean.harmer@kdab.com>2017-05-24 12:10:02 +0100
commit77d294db076dac19e8b549b445ffede9f7260c84 (patch)
tree828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/input/backend/action.cpp
parent59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff)
parent939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff)
Merge branch 'dev' into wip/animationwip/animation
Diffstat (limited to 'src/input/backend/action.cpp')
-rw-r--r--src/input/backend/action.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/input/backend/action.cpp b/src/input/backend/action.cpp
index 2b8ada042..601961dd9 100644
--- a/src/input/backend/action.cpp
+++ b/src/input/backend/action.cpp
@@ -38,13 +38,14 @@
****************************************************************************/
#include "action_p.h"
+
#include <Qt3DInput/qaction.h>
#include <Qt3DInput/qabstractactioninput.h>
-#include <Qt3DInput/private/qaction_p.h>
#include <Qt3DCore/qpropertyupdatedchange.h>
#include <Qt3DCore/qpropertynodeaddedchange.h>
#include <Qt3DCore/qpropertynoderemovedchange.h>
-#include <Qt3DCore/private/qpropertyupdatedchangebase_p.h>
+
+#include <Qt3DInput/private/qaction_p.h>
QT_BEGIN_NAMESPACE
@@ -82,7 +83,6 @@ void Action::setActionTriggered(bool actionTriggered)
e->setDeliveryFlags(Qt3DCore::QSceneChange::DeliverToAll);
e->setPropertyName("active");
e->setValue(m_actionTriggered);
- Qt3DCore::QPropertyUpdatedChangeBasePrivate::get(e.data())->m_isFinal = true;
notifyObservers(e);
}
}