diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-11-04 05:22:24 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-11-04 05:22:24 (GMT) |
| commit | ec502c9e9a26f984023e4f08126e033a504970b2 (patch) | |
| tree | 3082b195068a450b3844285f0f77ffe6fb32dc3c /src/gui/graphicsview/qgraphicsanchorlayout.cpp | |
| parent | 3a369d590c04e9528265c6bf2dd33f8606df8ea5 (diff) | |
| parent | 69b4b690cc26b697675264298623d9974cc76796 (diff) | |
| download | Qt-ec502c9e9a26f984023e4f08126e033a504970b2.zip Qt-ec502c9e9a26f984023e4f08126e033a504970b2.tar.gz Qt-ec502c9e9a26f984023e4f08126e033a504970b2.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/graphicsview/qgraphicsanchorlayout.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsanchorlayout.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout.cpp b/src/gui/graphicsview/qgraphicsanchorlayout.cpp index 22a7cf9..56d70e1 100644 --- a/src/gui/graphicsview/qgraphicsanchorlayout.cpp +++ b/src/gui/graphicsview/qgraphicsanchorlayout.cpp @@ -123,7 +123,7 @@ */ #include "qgraphicsanchorlayout_p.h" - +#ifndef QT_NO_GRAPHICSVIEW QT_BEGIN_NAMESPACE QGraphicsAnchor::QGraphicsAnchor(QGraphicsAnchorLayout *parentLayout) @@ -536,3 +536,4 @@ QSizeF QGraphicsAnchorLayout::sizeHint(Qt::SizeHint which, const QSizeF &constra } QT_END_NAMESPACE +#endif //QT_NO_GRAPHICSVIEW |