diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-13 01:05:02 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-13 01:05:02 +0200 |
| commit | 6b8f422c5e56b95aad298e1b984fb60fba1da282 (patch) | |
| tree | 545dac994ef985cc91d92fa77da21581b6762c86 /src/widgets/dialogs/qfiledialog.cpp | |
| parent | d04982dc84d66bec92b4b3767538676cf925ef17 (diff) | |
| parent | d9e66f63a95b24ce3a7d2a30ccaf4dcab85d55a0 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/corelib/global/qglobal.cpp
src/corelib/io/qsettings.cpp
src/corelib/itemmodels/qstringlistmodel.cpp
tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03
Diffstat (limited to 'src/widgets/dialogs/qfiledialog.cpp')
| -rw-r--r-- | src/widgets/dialogs/qfiledialog.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index 1cf2d2b05e..acda6bac3e 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -2076,7 +2076,7 @@ QString QFileDialog::labelText(DialogLabel label) const The dialog's caption is set to \a caption. If \a caption is not specified then a default caption will be used. - On Windows, and OS X, this static function will use the + On Windows, and \macos, this static function will use the native file dialog and not a QFileDialog. On Windows the dialog will spin a blocking modal event loop that will not @@ -2187,7 +2187,7 @@ QUrl QFileDialog::getOpenFileUrl(QWidget *parent, The dialog's caption is set to \a caption. If \a caption is not specified then a default caption will be used. - On Windows, and OS X, this static function will use the + On Windows, and \macos, this static function will use the native file dialog and not a QFileDialog. On Windows the dialog will spin a blocking modal event loop that will not @@ -2310,12 +2310,12 @@ QList<QUrl> QFileDialog::getOpenFileUrls(QWidget *parent, The dialog's caption is set to \a caption. If \a caption is not specified, a default caption will be used. - On Windows, and OS X, this static function will use the + On Windows, and \macos, this static function will use the native file dialog and not a QFileDialog. On Windows the dialog will spin a blocking modal event loop that will not dispatch any QTimers, and if \a parent is not 0 then it will position the - dialog just below the parent's title bar. On OS X, with its native file + dialog just below the parent's title bar. On \macos, with its native file dialog, the filter argument is ignored. On Unix/X11, the normal behavior of the file dialog is to resolve and @@ -2418,7 +2418,7 @@ QUrl QFileDialog::getSaveFileUrl(QWidget *parent, pass. To ensure a native file dialog, \l{QFileDialog::}{ShowDirsOnly} must be set. - On Windows and OS X, this static function will use the + On Windows and \macos, this static function will use the native file dialog and not a QFileDialog. However, the native Windows file dialog does not support displaying files in the directory chooser. You need to pass \l{QFileDialog::}{DontUseNativeDialog} to display files using a |