diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-03 17:34:00 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-03 17:34:00 (GMT) |
| commit | ecca301bd0a9db778b97852953b49f3971b6cecc (patch) | |
| tree | 6330cb17a05de1d81f2277145151fb618f6924c7 | |
| parent | 8feb69b5b59aa697793c377cc79afd9e873e2d6d (diff) | |
| parent | 271a90c962ca6e419b2a6831f35a6a06be80a85d (diff) | |
| download | Qt-ecca301bd0a9db778b97852953b49f3971b6cecc.zip Qt-ecca301bd0a9db778b97852953b49f3971b6cecc.tar.gz Qt-ecca301bd0a9db778b97852953b49f3971b6cecc.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix doc for deprecated QGridLayout::colSpacing: point to existing method
qDebug() << myPointF would remove spaces in following arguments.
| -rw-r--r-- | src/corelib/tools/qpoint.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qgridlayout.cpp | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/src/gui/kernel/qgridlayout.cpp b/src/gui/kernel/qgridlayout.cpp index dbd3c01..81a4d04 100644 --- a/src/gui/kernel/qgridlayout.cpp +++ b/src/gui/kernel/qgridlayout.cpp @@ -1852,7 +1852,7 @@ void QGridLayout::invalidate() /*! \fn int QGridLayout::colSpacing(int col) const - Use columnSpacing() instead. + Use columnMinimumWidth() instead. */ /*! |