diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-04 14:03:03 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-04 14:03:03 +0200 |
| commit | 67dea992954a4499d81ee63457263f913ca92c50 (patch) | |
| tree | 352e5879cd0bd50f3fe27117530ea1f601b97079 /src/quick3d/imports | |
| parent | ba2974a8abdf0048d2c8ecc821d369c74598e39f (diff) | |
| parent | d947ef04bc162d9f1816afb6188e8ef0a30c5143 (diff) | |
Merge 5.9 into 5.9.0
Change-Id: I02adbc5294f9d5879cb05e75eccad74196ea2a7c
Diffstat (limited to 'src/quick3d/imports')
| -rw-r--r-- | src/quick3d/imports/input/qt3dquick3dinputplugin.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp index 9d83f964f..5719a2b98 100644 --- a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp +++ b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp @@ -81,7 +81,9 @@ void Qt3DQuick3DInputPlugin::registerTypes(const char *uri) qmlRegisterType<Qt3DInput::QInputSettings>(uri, 2, 0, "InputSettings"); qmlRegisterUncreatableType<Qt3DInput::QMouseEvent>(uri, 2, 0, "MouseEvent", QStringLiteral("Events cannot be created")); +#if QT_CONFIG(wheelevent) qmlRegisterUncreatableType<Qt3DInput::QWheelEvent>(uri, 2, 0, "WheelEvent", QStringLiteral("Events cannot be created")); +#endif qmlRegisterType<Qt3DInput::QMouseHandler>(uri, 2, 0, "MouseHandler"); qmlRegisterType<Qt3DInput::QMouseDevice>(uri, 2, 0, "MouseDevice"); |