diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-10 22:24:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-10 22:24:01 (GMT) |
| commit | dbfe5f81e300de3a43311197826f23ff031b4b23 (patch) | |
| tree | 3d5de422787532e3928afb39869c3d695df1034b /src/corelib/tools/qpoint.cpp | |
| parent | f74029e286e97067ac39086955481bf979af69dc (diff) | |
| parent | e396749026f1a22f905540befa9e2ed8ba8b46b9 (diff) | |
| download | Qt-dbfe5f81e300de3a43311197826f23ff031b4b23.zip Qt-dbfe5f81e300de3a43311197826f23ff031b4b23.tar.gz Qt-dbfe5f81e300de3a43311197826f23ff031b4b23.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Assistant: Remove assertion for all files being watched.
Fixed regression.
Added method to clear the undo/redo stacks.
Fixed setting back spaces when streaming a QPointF
Move find widget in it's own source file. Some further cleanup.
Diffstat (limited to 'src/corelib/tools/qpoint.cpp')
| -rw-r--r-- | src/corelib/tools/qpoint.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qpoint.cpp b/src/corelib/tools/qpoint.cpp index d60087f..9850ee7 100644 --- a/src/corelib/tools/qpoint.cpp +++ b/src/corelib/tools/qpoint.cpp @@ -374,7 +374,7 @@ QDebug operator<<(QDebug dbg, const QPoint &p) { QDebug operator<<(QDebug d, const QPointF &p) { d.nospace() << "QPointF(" << p.x() << ", " << p.y() << ')'; - return d; + return d.space(); } #endif |