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/kernel/qwidget_p.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/widgets/kernel/qwidget_p.h') diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index e2affa802c..a24d13e0e1 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -67,9 +67,11 @@ #if QT_CONFIG(graphicseffect) #include #endif +#if QT_CONFIG(graphicsview) #include "QtWidgets/qgraphicsproxywidget.h" #include "QtWidgets/qgraphicsscene.h" #include "QtWidgets/qgraphicsview.h" +#endif #include QT_BEGIN_NAMESPACE @@ -232,7 +234,7 @@ struct QWExtra { // Regular pointers (keep them together to avoid gaps on 64 bits architectures). void *glContext; // if the widget is hijacked by QGLWindowSurface QTLWExtra *topextra; // only useful for TLWs -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) QGraphicsProxyWidget *proxyWidget; // if the widget is embedded #endif #ifndef QT_NO_CURSOR @@ -404,7 +406,7 @@ public: const QRegion &rgn, const QPoint &offset, int flags, QPainter *sharedPainter, QWidgetBackingStore *backingStore); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) static QGraphicsProxyWidget * nearestGraphicsProxyWidget(const QWidget *origin); #endif void repaint_sys(const QRegion &rgn); @@ -532,7 +534,7 @@ public: static QRect screenGeometry(const QWidget *widget) { QRect screen; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) QGraphicsProxyWidget *ancestorProxy = widget->d_func()->nearestGraphicsProxyWidget(widget); //It's embedded if it has an ancestor if (ancestorProxy) { -- cgit v1.2.3