summaryrefslogtreecommitdiffstats
path: root/src/widgets/dialogs
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-03-31 18:47:56 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2015-04-01 09:10:26 +0200
commit0e6ee136c91432d4ceeeda64e5a5fa88231398d4 (patch)
tree6060e002af2900007895f6efa757989dd4c190c9 /src/widgets/dialogs
parent418869d9158ea5cd998ba30778b0b7173b48161b (diff)
parent17294c5e4d15d5776f6e414b03671a4a9ed4993d (diff)
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts: src/testlib/qtestblacklist.cpp src/widgets/accessible/qaccessiblewidgets.cpp Change-Id: If032adb9296428f62384ed835dbf41ee7a0b886c
Diffstat (limited to 'src/widgets/dialogs')
-rw-r--r--src/widgets/dialogs/qfiledialog.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index 455111225e..6a1374e3ee 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -976,6 +976,16 @@ QDir QFileDialog::directory() const
\note The non-native QFileDialog supports only local files.
+ \note On Windows, it is possible to pass URLs representing
+ one of the \e {virtual folders}, such as "Computer" or "Network".
+ This is done by passing a QUrl using the scheme \c clsid followed
+ by the CLSID value with the curly braces removed. For example the URL
+ \c clsid:374DE290-123F-4565-9164-39C4925E467B denotes the download
+ location. For a complete list of possible values, see the MSDN documentation on
+ \l{https://msdn.microsoft.com/en-us/library/windows/desktop/dd378457.aspx}{KNOWNFOLDERID}.
+ This feature was added in Qt 5.5.
+
+ \sa QUuid
\since 5.2
*/
void QFileDialog::setDirectoryUrl(const QUrl &directory)