diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-06 05:56:57 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-06 05:56:57 (GMT) |
| commit | 164f2b1e013adcf829cdfac2875ab25109a7c578 (patch) | |
| tree | 072c58ae29329c2ba6a3d523d2260a720410dcfe /src/gui/dialogs/qfiledialog_mac.mm | |
| parent | b185b901ea31bfdc2db781e271132d34d0e8ce32 (diff) | |
| parent | faa534e55b9a03dabc44565e45f2f19297edf29d (diff) | |
| download | Qt-164f2b1e013adcf829cdfac2875ab25109a7c578.zip Qt-164f2b1e013adcf829cdfac2875ab25109a7c578.tar.gz Qt-164f2b1e013adcf829cdfac2875ab25109a7c578.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/dialogs/qfiledialog_mac.mm')
| -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); } |