diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-10 10:01:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-10 10:01:53 (GMT) |
| commit | 3308925558677f1882f1c70ef6b86f8a83fa8b65 (patch) | |
| tree | 38afacf496400fbd33ee2a5821a5369910421639 /src/corelib | |
| parent | f74029e286e97067ac39086955481bf979af69dc (diff) | |
| parent | 54290ef776a311f0c303e2a8df4de5e39e9a032a (diff) | |
| download | Qt-3308925558677f1882f1c70ef6b86f8a83fa8b65.zip Qt-3308925558677f1882f1c70ef6b86f8a83fa8b65.tar.gz Qt-3308925558677f1882f1c70ef6b86f8a83fa8b65.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:
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')
| -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 |