summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-11-03 12:03:18 +1000
committerJason McDonald <jason.mcdonald@nokia.com>2009-11-03 12:03:18 +1000
commitb86358babd9e7dc848d5725dda272b9713b9344b (patch)
treea017c1c4dafc17118f43dbb18c088f6e35087c2b
parentd8251a83c274dfafc14227cfed52a1afc32a0f1a (diff)
parent5b21746da4899a7d6dd78cf949e0a918c127fd49 (diff)
downloadqt4-tools-b86358babd9e7dc848d5725dda272b9713b9344b.tar.gz
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
-rw-r--r--src/gui/dialogs/qfiledialog_mac.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/qfiledialog_mac.mm b/src/gui/dialogs/qfiledialog_mac.mm
index 3914ab1f7c..8bca0253b9 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);
}