diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-13 14:51:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-13 14:51:31 (GMT) |
| commit | 1991e2e27bf2bee56ec71331e70d9c762a3c6b36 (patch) | |
| tree | 5e7230af878241ac01b18fd203bddba3aa0cc8f1 | |
| parent | 35de1868892169dc40a4fb9fb07d1b45cb40e98f (diff) | |
| parent | a6006b9b97634ae93e2ccc2dd93c0161e69d55dc (diff) | |
| download | Qt-1991e2e27bf2bee56ec71331e70d9c762a3c6b36.zip Qt-1991e2e27bf2bee56ec71331e70d9c762a3c6b36.tar.gz Qt-1991e2e27bf2bee56ec71331e70d9c762a3c6b36.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Disable selection of Libraries on Windows 7 in getExistingDirectory().
| -rw-r--r-- | src/gui/dialogs/qfiledialog_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/qfiledialog_win.cpp b/src/gui/dialogs/qfiledialog_win.cpp index 5b192b4..98860c4 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) |