summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-29 12:56:11 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-29 12:56:11 (GMT)
commite2f9547983c15be88c0a096dd52cc7c7a0eac0c6 (patch)
tree8fc8d27b673a0bb1b0fe5d2c480803d78ab61ccc /src
parent26af4d54ea4f3a48d053038f34a00aa1119a585b (diff)
parentd98d31ca34a84a03dbac20fbf1dc88c0f8fd93cb (diff)
downloadQt-e2f9547983c15be88c0a096dd52cc7c7a0eac0c6.zip
Qt-e2f9547983c15be88c0a096dd52cc7c7a0eac0c6.tar.gz
Qt-e2f9547983c15be88c0a096dd52cc7c7a0eac0c6.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc fix. No need to put something deprecated if it's not. Warn if the plugin seems to not exist instead of simply passing.
Diffstat (limited to 'src')
-rw-r--r--src/gui/dialogs/qfiledialog.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
index 21650bb..089e04a 100644
--- a/src/gui/dialogs/qfiledialog.cpp
+++ b/src/gui/dialogs/qfiledialog.cpp
@@ -229,11 +229,10 @@ 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.
- This value is obsolete and does nothing since Qt 4.5:
\value DontUseSheet In previous versions of Qt, the static
functions would create a sheet by default if the static function
- was given a parent. This is no longer supported in Qt 4.5, The
+ was given a parent. This is no longer supported and does nothing in Qt 4.5, The
static functions will always be an application modal dialog. If
you want to use sheets, use QFileDialog::open() instead.