diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-02 13:55:31 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-02 13:55:31 (GMT) |
| commit | a0f83f7e06dfc4b171a877a4e30a53c08a4c6593 (patch) | |
| tree | 8701567e114edc114c62120cdba746352e824651 /src/gui | |
| parent | 5f7d92b32e375aa7c2d0acf69d1fc033c6fd476a (diff) | |
| parent | 5b21746da4899a7d6dd78cf949e0a918c127fd49 (diff) | |
| download | Qt-a0f83f7e06dfc4b171a877a4e30a53c08a4c6593.zip Qt-a0f83f7e06dfc4b171a877a4e30a53c08a4c6593.tar.gz Qt-a0f83f7e06dfc4b171a877a4e30a53c08a4c6593.tar.bz2 | |
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/gui')
| -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 3914ab1..8bca025 100644 --- a/src/gui/dialogs/qfiledialog_mac.mm +++ b/src/gui/dialogs/qfiledialog_mac.mm @@ -819,8 +819,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); } |