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/qgraphicsscenebsptreeindex_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/qgraphicsscenebsptreeindex_p.h')
-rw-r--r-- | src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h b/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h index b195a4757c..8e78407762 100644 --- a/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h +++ b/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h @@ -53,8 +53,6 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> -#if !defined(QT_NO_GRAPHICSVIEW) - #include "qgraphicssceneindex_p.h" #include "qgraphicsitem_p.h" #include "qgraphicsscene_bsp_p.h" @@ -62,6 +60,8 @@ #include <QtCore/qrect.h> #include <QtCore/qlist.h> +QT_REQUIRE_CONFIG(graphicsview); + QT_BEGIN_NAMESPACE static const int QGRAPHICSSCENE_INDEXTIMER_TIMEOUT = 2000; @@ -199,6 +199,4 @@ static inline bool QRectF_intersects(const QRectF &s, const QRectF &r) QT_END_NAMESPACE -#endif // QT_NO_GRAPHICSVIEW - #endif // QGRAPHICSBSPTREEINDEX_H |