diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-29 00:38:01 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-29 00:38:01 +0200 |
commit | cdb56c42fc1145ad25560720fb95df2bfa760a20 (patch) | |
tree | 4dbe524a511b9343464e8509bd5352715aebdfa9 /src/widgets/graphicsview/qgraphicsanchorlayout_p.h | |
parent | 87583738f960e83918da3b66e455e75c144fbf8e (diff) | |
parent | e918334045612ec2c7c6203845ad05c4a1972e87 (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
mkspecs/features/uikit/xcodebuild.mk
tests/auto/other/lancelot/tst_lancelot.cpp
tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
Change-Id: Ia0ae2de86094120281abd445138877c2cc3e882c
Diffstat (limited to 'src/widgets/graphicsview/qgraphicsanchorlayout_p.h')
-rw-r--r-- | src/widgets/graphicsview/qgraphicsanchorlayout_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout_p.h b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h index ee11cb8561..b6d8a12658 100644 --- a/src/widgets/graphicsview/qgraphicsanchorlayout_p.h +++ b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h @@ -579,7 +579,7 @@ public: bool graphHasConflicts[2]; QSet<QGraphicsLayoutItem *> m_floatItems[2]; -#if defined(QT_DEBUG) || defined(Q_AUTOTEST_EXPORT) +#if defined(QT_DEBUG) || defined(QT_BUILD_INTERNAL) bool lastCalculationUsedSimplex[2]; #endif |