diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2009-11-02 14:43:11 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2009-11-02 14:43:11 (GMT) |
| commit | 2ed925753cb194970712330edca4da8e91fa8f28 (patch) | |
| tree | d06c72229e1afeac25989a5409b052fa5cefeda6 /src/gui/dialogs/qfiledialog_p.h | |
| parent | cf800465369fb1ef84e8bddbbbfa7128d95afd27 (diff) | |
| parent | 5e0bdffd92cbff2a9eb551f77850a24bf2a2116a (diff) | |
| download | Qt-2ed925753cb194970712330edca4da8e91fa8f28.zip Qt-2ed925753cb194970712330edca4da8e91fa8f28.tar.gz Qt-2ed925753cb194970712330edca4da8e91fa8f28.tar.bz2 | |
Merge branch 'feature' into 4.6
Diffstat (limited to 'src/gui/dialogs/qfiledialog_p.h')
| -rw-r--r-- | src/gui/dialogs/qfiledialog_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/dialogs/qfiledialog_p.h b/src/gui/dialogs/qfiledialog_p.h index 32cd397..0e447a3 100644 --- a/src/gui/dialogs/qfiledialog_p.h +++ b/src/gui/dialogs/qfiledialog_p.h @@ -234,9 +234,9 @@ public: QStringList watching; QFileSystemModel *model; -#ifndef QT_NO_COMPLETER +#ifndef QT_NO_FSCOMPLETER QFSCompleter *completer; -#endif //QT_NO_COMPLETER +#endif //QT_NO_FSCOMPLETER QFileDialog::FileMode fileMode; QFileDialog::AcceptMode acceptMode; |