diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-06 07:24:18 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-06 07:24:18 (GMT) |
| commit | ebe228f3ecaa379bbfa1e8a48b0aba820a5c8254 (patch) | |
| tree | 131f616937c6b718702ff3ccb9370eeae7b4c9b6 /src/gui/dialogs | |
| parent | 9418962051579959981515bb74bf6463436aa75e (diff) | |
| parent | faa534e55b9a03dabc44565e45f2f19297edf29d (diff) | |
| download | Qt-ebe228f3ecaa379bbfa1e8a48b0aba820a5c8254.zip Qt-ebe228f3ecaa379bbfa1e8a48b0aba820a5c8254.tar.gz Qt-ebe228f3ecaa379bbfa1e8a48b0aba820a5c8254.tar.bz2 | |
Merge remote branch 'qt-official/4.6' into 4.6
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qfiledialog_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/qfiledialog_mac.mm b/src/gui/dialogs/qfiledialog_mac.mm index 4af5688..b0e6575 100644 --- a/src/gui/dialogs/qfiledialog_mac.mm +++ b/src/gui/dialogs/qfiledialog_mac.mm @@ -830,8 +830,8 @@ void QFileDialogPrivate::qt_mac_filedialog_event_proc(const NavEventCallbackMess || mode == QFileDialog::ExistingFiles){ // When changing directory, the current selection is cleared if // we are supposed to be selecting files only: - fileDialogPrivate->mCurrentSelectionList.clear(); if (!fileDialogPrivate->mCurrentSelection.isEmpty()){ + fileDialogPrivate->mCurrentSelectionList.clear(); fileDialogPrivate->mCurrentSelection.clear(); emit fileDialogPrivate->q_func()->currentChanged(fileDialogPrivate->mCurrentSelection); } |