diff options
author | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 12:01:25 +0100 |
---|---|---|
committer | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 12:02:41 +0100 |
commit | 79f2480c868523a7d8ffc9fb15055e8eab3237ba (patch) | |
tree | 8336143e8c09810dc97324970fed61af27e26a97 /src/widgets/itemviews/qdirmodel.cpp | |
parent | 7e4f32993498db0e06346e32458a1ec7d0c7b3ec (diff) | |
parent | 12f221410fbe41d0b2efda4cd3289dfcf9044aa8 (diff) |
Merge remote-tracking branch 'origin/api_changes' into containters
Conflicts:
src/corelib/kernel/qmetaobject.cpp
src/corelib/kernel/qvariant.cpp
src/tools/moc/moc.h
Change-Id: I2cd3d95b41d2636738c6b98064864941e3b0b4e6
Diffstat (limited to 'src/widgets/itemviews/qdirmodel.cpp')
-rw-r--r-- | src/widgets/itemviews/qdirmodel.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/itemviews/qdirmodel.cpp b/src/widgets/itemviews/qdirmodel.cpp index ee097e5c41..490c272e39 100644 --- a/src/widgets/itemviews/qdirmodel.cpp +++ b/src/widgets/itemviews/qdirmodel.cpp @@ -1011,12 +1011,12 @@ QModelIndex QDirModel::mkdir(const QModelIndex &parent, const QString &name) /*! Removes the directory corresponding to the model item \a index in the - directory model and \bold{deletes the corresponding directory from the + directory model and \b{deletes the corresponding directory from the file system}, returning true if successful. If the directory cannot be removed, false is returned. \warning This function deletes directories from the file system; it does - \bold{not} move them to a location where they can be recovered. + \b{not} move them to a location where they can be recovered. \sa remove() */ @@ -1046,11 +1046,11 @@ bool QDirModel::rmdir(const QModelIndex &index) } /*! - Removes the model item \a index from the directory model and \bold{deletes the + Removes the model item \a index from the directory model and \b{deletes the corresponding file from the file system}, returning true if successful. If the item cannot be removed, false is returned. - \warning This function deletes files from the file system; it does \bold{not} + \warning This function deletes files from the file system; it does \b{not} move them to a location where they can be recovered. \sa rmdir() @@ -1134,7 +1134,7 @@ QIcon QDirModel::fileIcon(const QModelIndex &index) const /*! Returns the file information for the specified model \a index. - \bold{Note:} If the model index represents a symbolic link in the + \b{Note:} If the model index represents a symbolic link in the underlying filing system, the file information returned will contain information about the symbolic link itself, regardless of whether resolveSymlinks is enabled or not. |