diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-11-03 15:37:05 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-11-03 15:37:05 (GMT) |
| commit | c0a58b079d00dad484faa6249b8109a639576399 (patch) | |
| tree | d2828950d8e5664da5606783161f2a48db3ce722 /src/gui | |
| parent | 93ec4104781d7f9929b8b8a05dee3d94f8cd4b17 (diff) | |
| parent | c95a0e6e8eb8ba5fd2a4412b318ad998b3ccb4fc (diff) | |
| download | Qt-c0a58b079d00dad484faa6249b8109a639576399.zip Qt-c0a58b079d00dad484faa6249b8109a639576399.tar.gz Qt-c0a58b079d00dad484faa6249b8109a639576399.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6
Conflicts:
src/gui/kernel/qevent.cpp
src/network/ssl/qsslerror.cpp
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/itemviews/qdirmodel.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qevent.cpp | 2 | ||||
| -rw-r--r-- | src/gui/symbian/qsymbianevent.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/itemviews/qdirmodel.cpp b/src/gui/itemviews/qdirmodel.cpp index 2973741..942cfd7 100644 --- a/src/gui/itemviews/qdirmodel.cpp +++ b/src/gui/itemviews/qdirmodel.cpp @@ -1351,7 +1351,7 @@ QString QDirModelPrivate::size(const QModelIndex &index) const return QFileSystemModel::tr("%1 MB").arg(QLocale().toString(qreal(bytes) / mb, 'f', 1)); if (bytes >= kb) return QFileSystemModel::tr("%1 KB").arg(QLocale().toString(bytes / kb)); - return QFileSystemModel::tr("%1 bytes").arg(QLocale().toString(bytes)); + return QFileSystemModel::tr("%1 byte(s)").arg(QLocale().toString(bytes)); } QString QDirModelPrivate::type(const QModelIndex &index) const diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index ac597e4..55a329c 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -4400,7 +4400,7 @@ bool QGestureEvent::isAccepted(Qt::GestureType gestureType) const /*! \internal - Sets the widget for this event. + Sets the widget for this event to the \a widget specified. */ void QGestureEvent::setWidget(QWidget *widget) { diff --git a/src/gui/symbian/qsymbianevent.cpp b/src/gui/symbian/qsymbianevent.cpp index af2c861..2799e6f 100644 --- a/src/gui/symbian/qsymbianevent.cpp +++ b/src/gui/symbian/qsymbianevent.cpp @@ -66,13 +66,13 @@ QT_BEGIN_NAMESPACE */ /*! - \fn QSymbianEvent::type() + \fn QSymbianEvent::type() const Returns the event type contained in the QSymbianEvent instance. */ /*! - \fn QSymbianEvent::isValid() + \fn QSymbianEvent::isValid() const Returns whether this QSymbianEvent instance contains a valid event. */ |