diff options
author | Stephan Binner <stephan.binner@basyskom.com> | 2017-07-23 11:31:32 +0200 |
---|---|---|
committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-08-15 05:10:10 +0000 |
commit | e6fad35155a25a932386ad6f8421efd74404ac7f (patch) | |
tree | 9bb2e2c71d5b2ea305937cb5046b6e26141bab18 /src/widgets/util/qscroller.cpp | |
parent | 306071e50eac8290d234caab90985ddf705a5fc6 (diff) |
Convert features.graphicsview to QT_[REQUIRE_]CONFIG
Change-Id: I1083097802772624e5d414678b4612308683a56f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/widgets/util/qscroller.cpp')
-rw-r--r-- | src/widgets/util/qscroller.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/widgets/util/qscroller.cpp b/src/widgets/util/qscroller.cpp index a348327c92..d8ac686fb9 100644 --- a/src/widgets/util/qscroller.cpp +++ b/src/widgets/util/qscroller.cpp @@ -52,9 +52,11 @@ #include <QMap> #include <QApplication> #include <QAbstractScrollArea> +#if QT_CONFIG(graphicsview) #include <QGraphicsObject> #include <QGraphicsScene> #include <QGraphicsView> +#endif #include <QDesktopWidget> #include <QVector2D> #include <QtCore/qmath.h> @@ -429,12 +431,12 @@ Qt::GestureType QScroller::grabGesture(QObject *target, ScrollerGestureType scro widget->grabGesture(sp->recognizerType); if (scrollGestureType == TouchGesture) widget->setAttribute(Qt::WA_AcceptTouchEvents); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) } else if (QGraphicsObject *go = qobject_cast<QGraphicsObject*>(target)) { if (scrollGestureType == TouchGesture) go->setAcceptTouchEvents(true); go->grabGesture(sp->recognizerType); -#endif // QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) } return sp->recognizerType; } @@ -473,7 +475,7 @@ void QScroller::ungrabGesture(QObject *target) if (target->isWidgetType()) { QWidget *widget = static_cast<QWidget *>(target); widget->ungrabGesture(sp->recognizerType); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) } else if (QGraphicsObject *go = qobject_cast<QGraphicsObject*>(target)) { go->ungrabGesture(sp->recognizerType); #endif @@ -571,7 +573,7 @@ QPointF QScroller::pixelPerMeter() const Q_D(const QScroller); QPointF ppm = d->pixelPerMeter; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (QGraphicsObject *go = qobject_cast<QGraphicsObject *>(d->target)) { QTransform viewtr; //TODO: the first view isn't really correct - maybe use an additional field in the prepare event? @@ -589,7 +591,7 @@ QPointF QScroller::pixelPerMeter() const ppm.ry() /= QLineF(p0, py).length(); } } -#endif // QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) return ppm; } @@ -1466,7 +1468,7 @@ bool QScrollerPrivate::prepareScrolling(const QPointF &position) if (QWidget *w = qobject_cast<QWidget *>(target)) setDpiFromWidget(w); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (QGraphicsObject *go = qobject_cast<QGraphicsObject *>(target)) { //TODO: the first view isn't really correct - maybe use an additional field in the prepare event? if (const auto *scene = go->scene()) { |