From e6fad35155a25a932386ad6f8421efd74404ac7f Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Sun, 23 Jul 2017 11:31:32 +0200 Subject: Convert features.graphicsview to QT_[REQUIRE_]CONFIG Change-Id: I1083097802772624e5d414678b4612308683a56f Reviewed-by: Oswald Buddenhagen --- src/widgets/widgets/qabstractscrollarea.cpp | 2 +- src/widgets/widgets/qcombobox.cpp | 2 +- src/widgets/widgets/qlineedit_p.cpp | 1 + src/widgets/widgets/qmenu.cpp | 4 ++-- src/widgets/widgets/qwidgetlinecontrol.cpp | 2 +- src/widgets/widgets/qwidgettextcontrol.cpp | 10 ++++++---- 6 files changed, 12 insertions(+), 9 deletions(-) (limited to 'src/widgets/widgets') diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp index 14498c8b90..d9cbad4766 100644 --- a/src/widgets/widgets/qabstractscrollarea.cpp +++ b/src/widgets/widgets/qabstractscrollarea.cpp @@ -1475,7 +1475,7 @@ bool QAbstractScrollAreaPrivate::canStartScrollingAt( const QPoint &startPos ) { Q_Q(QAbstractScrollArea); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) // don't start scrolling when a drag mode has been set. // don't start scrolling on a movable item. if (QGraphicsView *view = qobject_cast(q)) { diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index a4e71662c7..35f6346cc6 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -741,7 +741,7 @@ void QComboBoxPrivateContainer::hideEvent(QHideEvent *) { emit resetButton(); combo->update(); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) // QGraphicsScenePrivate::removePopup closes the combo box popup, it hides it non-explicitly. // Hiding/showing the QComboBox after this will unexpectedly show the popup as well. // Re-hiding the popup container makes sure it is explicitly hidden. diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp index 83dab9e110..79241ef720 100644 --- a/src/widgets/widgets/qlineedit_p.cpp +++ b/src/widgets/widgets/qlineedit_p.cpp @@ -56,6 +56,7 @@ #include "qinputmethod.h" #include "qlist.h" #endif +#include #include QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 4848eba7ec..46525b6124 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -2319,7 +2319,7 @@ void QMenu::popup(const QPoint &p, QAction *atAction) const bool actionListChanged = d->itemsDirty; QRect screen; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) bool isEmbedded = !bypassGraphicsProxyWidget(this) && d->nearestGraphicsProxyWidget(this); if (isEmbedded) screen = d->popupGeometry(this); @@ -3589,7 +3589,7 @@ void QMenu::internalDelayedPopup() d->activeMenu->d_func()->causedPopup.action = d->currentAction; QRect screen; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) bool isEmbedded = !bypassGraphicsProxyWidget(this) && d->nearestGraphicsProxyWidget(this); if (isEmbedded) screen = d->popupGeometry(this); diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp index 9555ccc5b6..9281cc8ced 100644 --- a/src/widgets/widgets/qwidgetlinecontrol.cpp +++ b/src/widgets/widgets/qwidgetlinecontrol.cpp @@ -53,7 +53,7 @@ #endif #include "qapplication.h" -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) #include "qgraphicssceneevent.h" #endif diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index 815cc8736b..c73dc7444c 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -58,7 +58,9 @@ #include "private/qtextdocument_p.h" #include "qtextlist.h" #include "private/qwidgettextcontrol_p.h" +#if QT_CONFIG(graphicsview) #include "qgraphicssceneevent.h" +#endif #include "qpagedpaintdevice.h" #include "private/qpagedpaintdevice_p.h" #include "qtextdocumentwriter.h" @@ -983,7 +985,7 @@ void QWidgetTextControl::processEvent(QEvent *e, const QMatrix &matrix, QWidget if (!d->contextWidget) { switch (e->type()) { -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) case QEvent::GraphicsSceneMouseMove: case QEvent::GraphicsSceneMousePress: case QEvent::GraphicsSceneMouseRelease: @@ -1001,7 +1003,7 @@ void QWidgetTextControl::processEvent(QEvent *e, const QMatrix &matrix, QWidget d->contextWidget = ev->widget(); break; } -#endif // QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) default: break; }; } @@ -1080,7 +1082,7 @@ void QWidgetTextControl::processEvent(QEvent *e, const QMatrix &matrix, QWidget } #endif -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) case QEvent::GraphicsSceneMousePress: { QGraphicsSceneMouseEvent *ev = static_cast(e); d->mousePressEvent(ev, ev->button(), matrix.map(ev->pos()), ev->modifiers(), ev->buttons(), @@ -1130,7 +1132,7 @@ void QWidgetTextControl::processEvent(QEvent *e, const QMatrix &matrix, QWidget if (d->dropEvent(ev->mimeData(), matrix.map(ev->pos()), ev->dropAction(), ev->source())) ev->accept(); break; } -#endif // QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) #ifdef QT_KEYPAD_NAVIGATION case QEvent::EnterEditFocus: case QEvent::LeaveEditFocus: -- cgit v1.2.3