diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:30:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:31:48 +0200 |
| commit | 106d3b9bf93325ea93c678270290b2c3dda9b764 (patch) | |
| tree | 26c56932d60964c83e81d9c33d6f37ebc36d6c56 /src/widgets/graphicsview/qgraphicsview_p.h | |
| parent | 79f679da9483c12979500dd48bc096d33af9ca6f (diff) | |
| parent | 8bebded9ab02b8eec67c44bfddf802d6bf9cda3c (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/plugins/platforms/cocoa/qcocoamenu.h
src/plugins/platforms/cocoa/qcocoamenu.mm
src/plugins/platforms/cocoa/qcocoawindow.mm
src/widgets/styles/qstylehelper_p.h
Change-Id: I54247c98dd79d2b3826fc062b8b11048c9c7d9bb
Diffstat (limited to 'src/widgets/graphicsview/qgraphicsview_p.h')
| -rw-r--r-- | src/widgets/graphicsview/qgraphicsview_p.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/widgets/graphicsview/qgraphicsview_p.h b/src/widgets/graphicsview/qgraphicsview_p.h index b34be77f11..0428b9ce70 100644 --- a/src/widgets/graphicsview/qgraphicsview_p.h +++ b/src/widgets/graphicsview/qgraphicsview_p.h @@ -54,8 +54,6 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qgraphicsview.h" -#if !defined(QT_NO_GRAPHICSVIEW) - #include <QtGui/qevent.h> #include <QtCore/qcoreapplication.h> #include "qgraphicssceneevent.h" @@ -63,6 +61,8 @@ #include <private/qabstractscrollarea_p.h> #include <private/qapplication_p.h> +QT_REQUIRE_CONFIG(graphicsview); + QT_BEGIN_NAMESPACE class Q_WIDGETS_EXPORT QGraphicsViewPrivate : public QAbstractScrollAreaPrivate @@ -231,6 +231,4 @@ public: QT_END_NAMESPACE -#endif // QT_NO_GRAPHICSVIEW - #endif |