diff options
-rw-r--r-- | src/quicktemplates2/qquickcombobox.cpp | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickcombobox_p.h | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickcontrol.cpp | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickcontrol_p.h | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickdial.cpp | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickdial_p.h | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickoverlay.cpp | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickoverlay_p.h | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickpopup.cpp | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickpopup_p.h | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickpopupitem.cpp | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickpopupitem_p_p.h | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickslider.cpp | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickslider_p.h | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickspinbox.cpp | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickspinbox_p.h | 2 |
16 files changed, 32 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp index 95d5fd45..59d66d99 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -1485,6 +1485,7 @@ void QQuickComboBox::mouseUngrabEvent() setPressed(false); } +#if QT_CONFIG(wheelevent) void QQuickComboBox::wheelEvent(QWheelEvent *event) { Q_D(QQuickComboBox); @@ -1498,6 +1499,7 @@ void QQuickComboBox::wheelEvent(QWheelEvent *event) event->setAccepted(d->currentIndex != oldIndex); } } +#endif void QQuickComboBox::componentComplete() { diff --git a/src/quicktemplates2/qquickcombobox_p.h b/src/quicktemplates2/qquickcombobox_p.h index 87453999..083ea166 100644 --- a/src/quicktemplates2/qquickcombobox_p.h +++ b/src/quicktemplates2/qquickcombobox_p.h @@ -185,7 +185,9 @@ protected: void mouseMoveEvent(QMouseEvent *event) override; void mouseReleaseEvent(QMouseEvent *event) override; void mouseUngrabEvent() override; +#if QT_CONFIG(wheelevent) void wheelEvent(QWheelEvent *event) override; +#endif void componentComplete() override; void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override; diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp index 73a0a0db..bc549b78 100644 --- a/src/quicktemplates2/qquickcontrol.cpp +++ b/src/quicktemplates2/qquickcontrol.cpp @@ -1273,6 +1273,7 @@ void QQuickControl::mouseReleaseEvent(QMouseEvent *event) event->accept(); } +#if QT_CONFIG(wheelevent) void QQuickControl::wheelEvent(QWheelEvent *event) { Q_D(QQuickControl); @@ -1281,6 +1282,7 @@ void QQuickControl::wheelEvent(QWheelEvent *event) event->setAccepted(d->wheelEnabled); } +#endif void QQuickControl::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) { diff --git a/src/quicktemplates2/qquickcontrol_p.h b/src/quicktemplates2/qquickcontrol_p.h index 0ba90e19..525dd303 100644 --- a/src/quicktemplates2/qquickcontrol_p.h +++ b/src/quicktemplates2/qquickcontrol_p.h @@ -182,7 +182,9 @@ protected: void mousePressEvent(QMouseEvent *event) override; void mouseMoveEvent(QMouseEvent *event) override; void mouseReleaseEvent(QMouseEvent *event) override; +#if QT_CONFIG(wheelevent) void wheelEvent(QWheelEvent *event) override; +#endif void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; diff --git a/src/quicktemplates2/qquickdial.cpp b/src/quicktemplates2/qquickdial.cpp index 0539b8cd..f05cc63f 100644 --- a/src/quicktemplates2/qquickdial.cpp +++ b/src/quicktemplates2/qquickdial.cpp @@ -738,6 +738,7 @@ void QQuickDial::touchUngrabEvent() d->handleUngrab(); } +#if QT_CONFIG(wheelevent) void QQuickDial::wheelEvent(QWheelEvent *event) { Q_D(QQuickDial); @@ -751,6 +752,7 @@ void QQuickDial::wheelEvent(QWheelEvent *event) event->setAccepted(!qFuzzyCompare(d->value, oldValue)); } } +#endif void QQuickDial::mirrorChange() { diff --git a/src/quicktemplates2/qquickdial_p.h b/src/quicktemplates2/qquickdial_p.h index b42db960..f774e525 100644 --- a/src/quicktemplates2/qquickdial_p.h +++ b/src/quicktemplates2/qquickdial_p.h @@ -140,7 +140,9 @@ protected: void mouseUngrabEvent() override; void touchEvent(QTouchEvent *event) override; void touchUngrabEvent() override; +#if QT_CONFIG(wheelevent) void wheelEvent(QWheelEvent *event) override; +#endif void mirrorChange() override; void componentComplete() override; diff --git a/src/quicktemplates2/qquickoverlay.cpp b/src/quicktemplates2/qquickoverlay.cpp index 90be951f..72506543 100644 --- a/src/quicktemplates2/qquickoverlay.cpp +++ b/src/quicktemplates2/qquickoverlay.cpp @@ -377,6 +377,7 @@ void QQuickOverlay::mouseReleaseEvent(QMouseEvent *event) } } +#if QT_CONFIG(wheelevent) void QQuickOverlay::wheelEvent(QWheelEvent *event) { Q_D(QQuickOverlay); @@ -392,6 +393,7 @@ void QQuickOverlay::wheelEvent(QWheelEvent *event) } event->ignore(); } +#endif bool QQuickOverlay::childMouseEventFilter(QQuickItem *item, QEvent *event) { diff --git a/src/quicktemplates2/qquickoverlay_p.h b/src/quicktemplates2/qquickoverlay_p.h index 45b261b7..793edf7e 100644 --- a/src/quicktemplates2/qquickoverlay_p.h +++ b/src/quicktemplates2/qquickoverlay_p.h @@ -87,7 +87,9 @@ protected: void mousePressEvent(QMouseEvent *event) override; void mouseMoveEvent(QMouseEvent *event) override; void mouseReleaseEvent(QMouseEvent *event) override; +#if QT_CONFIG(wheelevent) void wheelEvent(QWheelEvent *event) override; +#endif bool childMouseEventFilter(QQuickItem *item, QEvent *event) override; private: diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index 5feb9640..3a09bf84 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -1827,10 +1827,12 @@ bool QQuickPopup::overlayEvent(QQuickItem *item, QEvent *event) } } +#if QT_CONFIG(wheelevent) void QQuickPopup::wheelEvent(QWheelEvent *event) { event->accept(); } +#endif void QQuickPopup::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) { diff --git a/src/quicktemplates2/qquickpopup_p.h b/src/quicktemplates2/qquickpopup_p.h index 56dd3086..41b85dab 100644 --- a/src/quicktemplates2/qquickpopup_p.h +++ b/src/quicktemplates2/qquickpopup_p.h @@ -351,7 +351,9 @@ protected: virtual void mouseDoubleClickEvent(QMouseEvent *event); virtual void mouseUngrabEvent(); virtual bool overlayEvent(QQuickItem *item, QEvent *event); +#if QT_CONFIG(wheelevent) virtual void wheelEvent(QWheelEvent *event); +#endif virtual void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem); virtual void fontChange(const QFont &newFont, const QFont &oldFont); diff --git a/src/quicktemplates2/qquickpopupitem.cpp b/src/quicktemplates2/qquickpopupitem.cpp index 8c05c8be..60a4a6ee 100644 --- a/src/quicktemplates2/qquickpopupitem.cpp +++ b/src/quicktemplates2/qquickpopupitem.cpp @@ -222,11 +222,13 @@ void QQuickPopupItem::mouseUngrabEvent() d->popup->mouseUngrabEvent(); } +#if QT_CONFIG(wheelevent) void QQuickPopupItem::wheelEvent(QWheelEvent *event) { Q_D(QQuickPopupItem); d->popup->wheelEvent(event); } +#endif void QQuickPopupItem::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) { diff --git a/src/quicktemplates2/qquickpopupitem_p_p.h b/src/quicktemplates2/qquickpopupitem_p_p.h index e8904d71..5cc4095f 100644 --- a/src/quicktemplates2/qquickpopupitem_p_p.h +++ b/src/quicktemplates2/qquickpopupitem_p_p.h @@ -79,7 +79,9 @@ protected: void mouseReleaseEvent(QMouseEvent *event) override; void mouseDoubleClickEvent(QMouseEvent *event) override; void mouseUngrabEvent() override; +#if QT_CONFIG(wheelevent) void wheelEvent(QWheelEvent *event) override; +#endif void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override; void fontChange(const QFont &newFont, const QFont &oldFont) override; diff --git a/src/quicktemplates2/qquickslider.cpp b/src/quicktemplates2/qquickslider.cpp index c95385dd..eb21af4a 100644 --- a/src/quicktemplates2/qquickslider.cpp +++ b/src/quicktemplates2/qquickslider.cpp @@ -702,6 +702,7 @@ void QQuickSlider::touchUngrabEvent() d->handleUngrab(); } +#if QT_CONFIG(wheelevent) void QQuickSlider::wheelEvent(QWheelEvent *event) { Q_D(QQuickSlider); @@ -718,6 +719,7 @@ void QQuickSlider::wheelEvent(QWheelEvent *event) event->setAccepted(wasMoved); } } +#endif void QQuickSlider::mirrorChange() { diff --git a/src/quicktemplates2/qquickslider_p.h b/src/quicktemplates2/qquickslider_p.h index 0b3847f0..286047ed 100644 --- a/src/quicktemplates2/qquickslider_p.h +++ b/src/quicktemplates2/qquickslider_p.h @@ -138,7 +138,9 @@ protected: void mouseUngrabEvent() override; void touchEvent(QTouchEvent *event) override; void touchUngrabEvent() override; +#if QT_CONFIG(wheelevent) void wheelEvent(QWheelEvent *event) override; +#endif void mirrorChange() override; void componentComplete() override; diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp index e74c0497..4368236a 100644 --- a/src/quicktemplates2/qquickspinbox.cpp +++ b/src/quicktemplates2/qquickspinbox.cpp @@ -870,6 +870,7 @@ void QQuickSpinBox::touchUngrabEvent() d->handleUngrab(); } +#if QT_CONFIG(wheelevent) void QQuickSpinBox::wheelEvent(QWheelEvent *event) { Q_D(QQuickSpinBox); @@ -884,6 +885,7 @@ void QQuickSpinBox::wheelEvent(QWheelEvent *event) event->setAccepted(d->value != oldValue); } } +#endif void QQuickSpinBox::componentComplete() { diff --git a/src/quicktemplates2/qquickspinbox_p.h b/src/quicktemplates2/qquickspinbox_p.h index ed12e222..bd909126 100644 --- a/src/quicktemplates2/qquickspinbox_p.h +++ b/src/quicktemplates2/qquickspinbox_p.h @@ -139,7 +139,9 @@ protected: void timerEvent(QTimerEvent *event) override; void touchEvent(QTouchEvent *event) override; void touchUngrabEvent() override; +#if QT_CONFIG(wheelevent) void wheelEvent(QWheelEvent *event) override; +#endif void componentComplete() override; void itemChange(ItemChange change, const ItemChangeData &value) override; |