From 5ede5706a8b8052280981aa1d9c42999a24b74b5 Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Tue, 30 May 2017 22:22:22 +0200 Subject: Convert features.wheelevent to QT_CONFIG Change-Id: I46083a9115c199d1ebe024ed5f64b160a27462f1 Reviewed-by: Oswald Buddenhagen --- examples/widgets/graphicsview/chip/view.cpp | 2 +- examples/widgets/graphicsview/chip/view.h | 2 +- examples/widgets/graphicsview/elasticnodes/graphwidget.cpp | 2 +- examples/widgets/graphicsview/elasticnodes/graphwidget.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'examples/widgets/graphicsview') diff --git a/examples/widgets/graphicsview/chip/view.cpp b/examples/widgets/graphicsview/chip/view.cpp index 79b173bec7..491f1a54cf 100644 --- a/examples/widgets/graphicsview/chip/view.cpp +++ b/examples/widgets/graphicsview/chip/view.cpp @@ -64,7 +64,7 @@ #endif #include -#ifndef QT_NO_WHEELEVENT +#if QT_CONFIG(wheelevent) void GraphicsView::wheelEvent(QWheelEvent *e) { if (e->modifiers() & Qt::ControlModifier) { diff --git a/examples/widgets/graphicsview/chip/view.h b/examples/widgets/graphicsview/chip/view.h index 2d174250c2..89b2e813f1 100644 --- a/examples/widgets/graphicsview/chip/view.h +++ b/examples/widgets/graphicsview/chip/view.h @@ -69,7 +69,7 @@ public: GraphicsView(View *v) : QGraphicsView(), view(v) { } protected: -#ifndef QT_NO_WHEELEVENT +#if QT_CONFIG(wheelevent) void wheelEvent(QWheelEvent *) override; #endif diff --git a/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp b/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp index 8b2f0a0629..844c8f8aac 100644 --- a/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp +++ b/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp @@ -184,7 +184,7 @@ void GraphWidget::timerEvent(QTimerEvent *event) } //! [4] -#ifndef QT_NO_WHEELEVENT +#if QT_CONFIG(wheelevent) //! [5] void GraphWidget::wheelEvent(QWheelEvent *event) { diff --git a/examples/widgets/graphicsview/elasticnodes/graphwidget.h b/examples/widgets/graphicsview/elasticnodes/graphwidget.h index 79acb89985..5ed6aed452 100644 --- a/examples/widgets/graphicsview/elasticnodes/graphwidget.h +++ b/examples/widgets/graphicsview/elasticnodes/graphwidget.h @@ -73,7 +73,7 @@ public slots: protected: void keyPressEvent(QKeyEvent *event) override; void timerEvent(QTimerEvent *event) override; -#ifndef QT_NO_WHEELEVENT +#if QT_CONFIG(wheelevent) void wheelEvent(QWheelEvent *event) override; #endif void drawBackground(QPainter *painter, const QRectF &rect) override; -- cgit v1.2.3