diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-04 01:14:49 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-04 01:14:49 (GMT) |
| commit | e042014961636d459dc84df93ad2cca96049e2d1 (patch) | |
| tree | 483fac9c3e0e88d60527c9675fd0789253204fb4 /src/gui/dialogs/qfiledialog_p.h | |
| parent | 25e7b091c44c1cff2f74551a0603e85b4c286260 (diff) | |
| parent | 8caacf51667d4cf770b18a8b59e46f842861210e (diff) | |
| download | Qt-e042014961636d459dc84df93ad2cca96049e2d1.zip Qt-e042014961636d459dc84df93ad2cca96049e2d1.tar.gz Qt-e042014961636d459dc84df93ad2cca96049e2d1.tar.bz2 | |
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
Conflicts:
configure.exe
src/gui/graphicsview/qgraphicsitem_p.h
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; |