diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-04-14 13:32:22 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-04-14 13:32:22 (GMT) |
| commit | 0cc27cec860f46b1e349c428973cf4ce3331b285 (patch) | |
| tree | 801b2c1d8cb6b269f2b2f18e08e052cdc4f66749 /src/gui/dialogs/qfiledialog.cpp | |
| parent | 8a7199be73aea42eacf07c56a63d2b526204c8fb (diff) | |
| parent | b371999d3e9c207047be6afda89d008b6cf04763 (diff) | |
| download | Qt-0cc27cec860f46b1e349c428973cf4ce3331b285.zip Qt-0cc27cec860f46b1e349c428973cf4ce3331b285.tar.gz Qt-0cc27cec860f46b1e349c428973cf4ce3331b285.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
Diffstat (limited to 'src/gui/dialogs/qfiledialog.cpp')
| -rw-r--r-- | src/gui/dialogs/qfiledialog.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp index 3b5fb9f..cb74a3c 100644 --- a/src/gui/dialogs/qfiledialog.cpp +++ b/src/gui/dialogs/qfiledialog.cpp @@ -723,15 +723,19 @@ void QFileDialog::setVisible(bool visible) // Set WA_DontShowOnScreen so that QDialog::setVisible(visible) below // updates the state correctly, but skips showing the non-native version: setAttribute(Qt::WA_DontShowOnScreen); +#ifndef QT_NO_FSCOMPLETER //So the completer don't try to complete and therefore to show a popup d->completer->setModel(0); +#endif } else { d->nativeDialogInUse = false; setAttribute(Qt::WA_DontShowOnScreen, false); +#ifndef QT_NO_FSCOMPLETER if (d->proxyModel != 0) d->completer->setModel(d->proxyModel); else d->completer->setModel(d->model); +#endif } } |