diff options
| author | Jan Arve Saether <jan-arve.saether@digia.com> | 2013-11-28 14:41:25 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-09 16:22:38 +0100 |
| commit | 3be88bf778487d6fc3fdb80cee1ae43459ded0e2 (patch) | |
| tree | 37d152192c2644b749b4efefef7633324a1e0aa7 /src/widgets/graphicsview/qgraphicsgridlayout.cpp | |
| parent | 89277e10682c76403321968af2dbe3f6e44409c8 (diff) | |
Move QGridLayoutEngine to QtGui module
For MacOS 10.6 the exported symbols must be the same regardless of
debug/release configuration, because for debug builds it will by
default link to a release library.
We therefore cannot let some exported symbols depend on if QT_DEBUG
is defined or not. We therefore introduce QGRIDLAYOUTENGINE_DEBUG,
which is independent of debug/release configuration.
The whole dump() function concept should probably be revisited, but
I don't want to clutter this commit too much with such unrelated
things.
Change-Id: I7086f31e2c36fe22ce9c9a3eda37ea25302459a9
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/widgets/graphicsview/qgraphicsgridlayout.cpp')
| -rw-r--r-- | src/widgets/graphicsview/qgraphicsgridlayout.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/graphicsview/qgraphicsgridlayout.cpp b/src/widgets/graphicsview/qgraphicsgridlayout.cpp index 59f3d891f2..0ecb4af6bd 100644 --- a/src/widgets/graphicsview/qgraphicsgridlayout.cpp +++ b/src/widgets/graphicsview/qgraphicsgridlayout.cpp @@ -106,7 +106,7 @@ public: mutable QGraphicsLayoutStyleInfo *m_styleInfo; QGraphicsGridLayoutEngine engine; -#ifdef QT_DEBUG +#ifdef QGRIDLAYOUTENGINE_DEBUG void dump(int indent) const; #endif }; @@ -631,7 +631,7 @@ void QGraphicsGridLayout::invalidate() QGraphicsLayout::invalidate(); } -#ifdef QT_DEBUG +#ifdef QGRIDLAYOUTENGINE_DEBUG void QGraphicsGridLayoutPrivate::dump(int indent) const { if (qt_graphicsLayoutDebug()) { @@ -656,7 +656,7 @@ void QGraphicsGridLayout::setGeometry(const QRectF &rect) qSwap(left, right); effectiveRect.adjust(+left, +top, -right, -bottom); d->engine.setGeometries(effectiveRect, d->styleInfo()); -#ifdef QT_DEBUG +#ifdef QGRIDLAYOUTENGINE_DEBUG if (qt_graphicsLayoutDebug()) { static int counter = 0; qDebug("==== BEGIN DUMP OF QGraphicsGridLayout (%d)====", counter++); |