summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPrasanth Ullattil <prasanth.ullattil@nokia.com>2010-10-13 11:35:30 (GMT)
committerQt Commercial Integration <QtCommercial@digia.com>2012-01-31 10:24:49 (GMT)
commit5523cb9d8248494a6b00d2cc5e8b37fdc595af1e (patch)
treebe456bcee4fa7f4ac28542740247171d7f6152f6 /src
parent2fd21f04d23d5dd87ca0f6db238ae268492f5528 (diff)
downloadQt-5523cb9d8248494a6b00d2cc5e8b37fdc595af1e.zip
Qt-5523cb9d8248494a6b00d2cc5e8b37fdc595af1e.tar.gz
Qt-5523cb9d8248494a6b00d2cc5e8b37fdc595af1e.tar.bz2
Disable selection of Libraries on Windows 7 in getExistingDirectory().
The Libraries on Windows 7 are user-defined collection of folders, which is only a logical representation. There are no file system entries associated with it . This patch makes sure that user cannot choose a library when using the QFileDialog::getExistingDirectory(), in such cases it will show a standard windows warning message. Task-number: QTBUG-12655 Reviewed-by: Thierry Bastian
Diffstat (limited to 'src')
-rw-r--r--src/gui/dialogs/qfiledialog_win.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/qfiledialog_win.cpp b/src/gui/dialogs/qfiledialog_win.cpp
index 78803ba..c91c7e2 100644
--- a/src/gui/dialogs/qfiledialog_win.cpp
+++ b/src/gui/dialogs/qfiledialog_win.cpp
@@ -603,7 +603,7 @@ QString qt_win_CID_get_existing_directory(const QFileDialogArgs &args)
// Set the FOS_PICKFOLDERS flag
DWORD newOptions;
hr = pfd->GetOptions(&newOptions);
- newOptions |= FOS_PICKFOLDERS;
+ newOptions |= (FOS_PICKFOLDERS | FOS_FORCEFILESYSTEM);
if (SUCCEEDED(hr) && SUCCEEDED((hr = pfd->SetOptions(newOptions)))) {
QWidget *parentWindow = args.parent;
if (parentWindow)