summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2010-03-15 14:31:14 (GMT)
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2010-03-15 14:31:14 (GMT)
commit6b55f2d1316e06e1cf075c5737ec54ba597f8426 (patch)
tree1963fd01036027780f323709ce2b2accfc0f2f29 /src
parent72dd2a5e005531353bb97b9c9c35529610ebab9d (diff)
parent3ed25aafdf5a197e3e1ea9715997b698a394b99f (diff)
downloadQt-6b55f2d1316e06e1cf075c5737ec54ba597f8426.zip
Qt-6b55f2d1316e06e1cf075c5737ec54ba597f8426.tar.gz
Qt-6b55f2d1316e06e1cf075c5737ec54ba597f8426.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-staging1
Diffstat (limited to 'src')
-rw-r--r--src/gui/dialogs/qfiledialog.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
index 089e04a..ef2b223 100644
--- a/src/gui/dialogs/qfiledialog.cpp
+++ b/src/gui/dialogs/qfiledialog.cpp
@@ -228,7 +228,8 @@ Q_GUI_EXPORT _qt_filedialog_save_filename_hook qt_filedialog_save_filename_hook
\value ReadOnly Indicates that the model is readonly.
- \value HideNameFilterDetails Indicates if the is hidden or not.
+ \value HideNameFilterDetails Indicates if the file name filter details are
+ hidden or not.
\value DontUseSheet In previous versions of Qt, the static
functions would create a sheet by default if the static function