diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-01 02:48:03 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-01 02:48:03 (GMT) |
| commit | a26d7ada2ece592ae9447b4eae95c3add61a34d7 (patch) | |
| tree | 784e0732276ea08b3daa336ccec87ccaa17896a1 /src/declarative | |
| parent | b5117243a50cca51cf8f77d153f0c400084134ef (diff) | |
| parent | 67db3dc3b25e577a8389974bd06df9cd4b43059e (diff) | |
| download | Qt-a26d7ada2ece592ae9447b4eae95c3add61a34d7.zip Qt-a26d7ada2ece592ae9447b4eae95c3add61a34d7.tar.gz Qt-a26d7ada2ece592ae9447b4eae95c3add61a34d7.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeanchors.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeanchors.cpp b/src/declarative/graphicsitems/qdeclarativeanchors.cpp index dc1f09d..ffcedda 100644 --- a/src/declarative/graphicsitems/qdeclarativeanchors.cpp +++ b/src/declarative/graphicsitems/qdeclarativeanchors.cpp @@ -1059,7 +1059,7 @@ bool QDeclarativeAnchorsPrivate::checkVAnchorValid(QDeclarativeAnchorLine anchor return true; } -#include <moc_qdeclarativeanchors_p.cpp> - QT_END_NAMESPACE +#include <moc_qdeclarativeanchors_p.cpp> + |