diff -r b72c6db6890b -r 5dc02b23752f src/gui/dialogs/qfiledialog.cpp --- a/src/gui/dialogs/qfiledialog.cpp Wed Jun 23 19:07:03 2010 +0300 +++ b/src/gui/dialogs/qfiledialog.cpp Tue Jul 06 15:10:48 2010 +0300 @@ -228,7 +228,8 @@ \value ReadOnly Indicates that the model is readonly. - \value HideNameFilterDetails Indicates if the is hidden or not. + \value HideNameFilterDetails Indicates if the file name filter details are + hidden or not. \value DontUseSheet In previous versions of Qt, the static functions would create a sheet by default if the static function @@ -722,9 +723,19 @@ // 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 } }