diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-04-15 14:19:12 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-04-15 18:52:04 +0000 |
| commit | 10f24b782f3856e5f5ddfc6710ab4b94facbddb5 (patch) | |
| tree | 508b18c72066c6f1f0d67e739f1cf6c2c523238b /src/quick3d/imports | |
| parent | d6cd4dd23baca11915afc8e1d69c0278a7ff1e7b (diff) | |
Remove QAbstractAggregateActionInput
Change-Id: I48109b0149cf16699f5d3a6cafbaec4555d4db0b
Task-number: QTBUG-51493
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/imports')
| -rw-r--r-- | src/quick3d/imports/input/qt3dquick3dinputplugin.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp index 8f368c504..123e7c6d7 100644 --- a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp +++ b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp @@ -58,7 +58,8 @@ #include <Qt3DInput/private/qgenericinputdevice_p.h> #include <Qt3DQuickInput/private/quick3daxis_p.h> #include <Qt3DQuickInput/private/quick3daction_p.h> -#include <Qt3DQuickInput/private/quick3daggregateaction_p.h> +#include <Qt3DQuickInput/private/quick3dinputchord_p.h> +#include <Qt3DQuickInput/private/quick3dinputsequence_p.h> #include <Qt3DQuickInput/private/quick3dlogicaldevice_p.h> #include <Qt3DQuickInput/private/quick3dphysicaldevice_p.h> @@ -85,13 +86,12 @@ void Qt3DQuick3DInputPlugin::registerTypes(const char *uri) qmlRegisterExtendedType<Qt3DInput::QLogicalDevice, Qt3DInput::Input::Quick::Quick3DLogicalDevice>(uri, 2, 0, "LogicalDevice"); qmlRegisterUncreatableType<Qt3DInput::QAbstractActionInput>(uri, 2, 0, "AbstractActionInput", QStringLiteral("AbstractActionInput is abstract")); qmlRegisterType<Qt3DInput::QActionInput>(uri, 2, 0, "ActionInput"); - qmlRegisterUncreatableType<Qt3DInput::QAbstractAggregateActionInput>(uri, 2, 0, "AbstractAggregateActionInput", QStringLiteral("AbstractAggregateActionInput is abstract")); qmlRegisterType<Qt3DInput::QAxisInput>(uri, 2, 0, "AxisInput"); qmlRegisterType<Qt3DInput::QAxisSetting>(uri, 2, 0, "AxisSetting"); qmlRegisterExtendedType<Qt3DInput::QAxis, Qt3DInput::Input::Quick::Quick3DAxis>(uri, 2, 0, "Axis"); qmlRegisterExtendedType<Qt3DInput::QAction, Qt3DInput::Input::Quick::Quick3DAction>(uri, 2, 0, "Action"); - qmlRegisterExtendedType<Qt3DInput::QInputSequence, Qt3DInput::Input::Quick::Quick3DAggregateAction>(uri, 2, 0, "InputSequence"); - qmlRegisterExtendedType<Qt3DInput::QInputChord, Qt3DInput::Input::Quick::Quick3DAggregateAction>(uri, 2, 0, "InputChord"); + qmlRegisterExtendedType<Qt3DInput::QInputSequence, Qt3DInput::Input::Quick::Quick3DInputSequence>(uri, 2, 0, "InputSequence"); + qmlRegisterExtendedType<Qt3DInput::QInputChord, Qt3DInput::Input::Quick::Quick3DInputChord>(uri, 2, 0, "InputChord"); qmlRegisterExtendedUncreatableType<Qt3DInput::QAbstractPhysicalDevice, Qt3DInput::Input::Quick::Quick3DPhysicalDevice>(uri, 2, 0, "QAbstractPhysicalDevice", QStringLiteral("QAbstractPhysicalDevice is abstract")); qmlRegisterType<Qt3DInput::QGenericInputDevice>(uri, 2, 0, "GenericInputDevice"); #ifdef HAVE_QGAMEPAD |