diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-10-16 09:56:08 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-10-16 09:59:05 (GMT) |
| commit | 7e5724b7d4632899af2e84856dd7d6f2a1771ee0 (patch) | |
| tree | 713ba6c4f3769c4e26f0fdb384d2184c58d26fdd /src/gui | |
| parent | bdc951eb87e0b1aa752d3ec750cfd837714bd8b7 (diff) | |
| download | Qt-7e5724b7d4632899af2e84856dd7d6f2a1771ee0.zip Qt-7e5724b7d4632899af2e84856dd7d6f2a1771ee0.tar.gz Qt-7e5724b7d4632899af2e84856dd7d6f2a1771ee0.tar.bz2 | |
Make sure that the anchor layout autotests pass in release configuration
The problem was that lastCalculationUsedSimplex was only compiled in
debug mode. The autotests run in release, so it did not compile.
Reviewed-by: alexis
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsanchorlayout_p.cpp | 2 | ||||
| -rw-r--r-- | src/gui/graphicsview/qgraphicsanchorlayout_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp index c9821ae..5a531f5 100644 --- a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp +++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp @@ -1781,7 +1781,7 @@ bool QGraphicsAnchorLayoutPrivate::calculateTrunk(Orientation orientation, const sizeAtExpanding[orientation] = ad->sizeAtExpanding; } -#ifdef QT_DEBUG +#if defined(QT_DEBUG) || defined(Q_AUTOTEST_EXPORT) lastCalculationUsedSimplex[orientation] = needsSimplex; #endif diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.h b/src/gui/graphicsview/qgraphicsanchorlayout_p.h index d96a035..3a23677 100644 --- a/src/gui/graphicsview/qgraphicsanchorlayout_p.h +++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.h @@ -523,7 +523,7 @@ public: bool graphHasConflicts[2]; QSet<QGraphicsLayoutItem *> m_floatItems[2]; -#ifdef QT_DEBUG +#if defined(QT_DEBUG) || defined(Q_AUTOTEST_EXPORT) bool lastCalculationUsedSimplex[2]; #endif |