Fix build with -no-feature-wheelevent

Change-Id: I6f40794ae1977d1f23916bff6d0c58d44440fbe5
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
This commit is contained in:
J-P Nurmi 2017-01-31 12:55:29 +01:00
parent 67b1d4a3c0
commit db55ad70ed
16 changed files with 32 additions and 0 deletions

View File

@ -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()
{

View File

@ -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;

View File

@ -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)
{

View File

@ -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;

View File

@ -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()
{

View File

@ -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;

View File

@ -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)
{

View File

@ -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:

View File

@ -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)
{

View File

@ -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);

View File

@ -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)
{

View File

@ -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;

View File

@ -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()
{

View File

@ -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;

View File

@ -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()
{

View File

@ -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;