diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2010-04-12 10:53:53 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-04-12 10:53:53 (GMT) |
| commit | ab4b6120d76a33c44fd1ce8468c926f7cfa03f92 (patch) | |
| tree | b8a35d38320ea223eae0cdb0f1eade84b82d5be3 /src | |
| parent | 082ca8b884e407cbee65b04e602c9c309fa66e35 (diff) | |
| download | Qt-ab4b6120d76a33c44fd1ce8468c926f7cfa03f92.zip Qt-ab4b6120d76a33c44fd1ce8468c926f7cfa03f92.tar.gz Qt-ab4b6120d76a33c44fd1ce8468c926f7cfa03f92.tar.bz2 | |
Fix QT_NO_FSCOMPLETER
Merge-request: 2357
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
Diffstat (limited to 'src')
| -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 } } |