diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-05 07:26:06 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-05 07:26:06 (GMT) |
| commit | 7f7d4cdf01409283d32a6799c1f73663b8ec3ea1 (patch) | |
| tree | 057102ed546240efc7e5e8054e150fecf0e14001 /src/gui/dialogs | |
| parent | aa58293b57a05cd52b36ba14a05958dceb65c603 (diff) | |
| parent | 91c09562ed9c6eb1bd3a4dbd84a8cc64647751ee (diff) | |
| download | Qt-7f7d4cdf01409283d32a6799c1f73663b8ec3ea1.zip Qt-7f7d4cdf01409283d32a6799c1f73663b8ec3ea1.tar.gz Qt-7f7d4cdf01409283d32a6799c1f73663b8ec3ea1.tar.bz2 | |
Merge branch '4.5' into 4.6
Conflicts:
tests/auto/qsqlquery/tst_qsqlquery.cpp
tests/auto/qtextlayout/tst_qtextlayout.cpp
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); } |