diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-04-15 10:23:57 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-04-15 10:23:57 (GMT) |
| commit | e4282111378ce67a1ae9c235efbd89b327f1bb91 (patch) | |
| tree | 175fca0d6b40940f8bcba61e4b6563145f5dde70 /src/gui/dialogs/qprintdialog_unix.cpp | |
| parent | 114cb018c088570ff0640eeb0d57594905ff9fcf (diff) | |
| parent | b1c8bdc899cd276fcb90ad424b128bd7d8a21e21 (diff) | |
| download | Qt-e4282111378ce67a1ae9c235efbd89b327f1bb91.zip Qt-e4282111378ce67a1ae9c235efbd89b327f1bb91.tar.gz Qt-e4282111378ce67a1ae9c235efbd89b327f1bb91.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/gui/dialogs/qprintdialog_unix.cpp')
| -rw-r--r-- | src/gui/dialogs/qprintdialog_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/qprintdialog_unix.cpp b/src/gui/dialogs/qprintdialog_unix.cpp index 9b4d6e8..e3c62be 100644 --- a/src/gui/dialogs/qprintdialog_unix.cpp +++ b/src/gui/dialogs/qprintdialog_unix.cpp @@ -703,7 +703,7 @@ QUnixPrintWidgetPrivate::QUnixPrintWidgetPrivate(QUnixPrintWidget *p) } #endif -#ifndef QT_NO_FILESYSTEMMODEL +#if !defined(QT_NO_FILESYSTEMMODEL) && !defined(QT_NO_COMPLETER) QFileSystemModel *fsm = new QFileSystemModel(widget.filename); fsm->setRootPath(QDir::homePath()); widget.filename->setCompleter(new QCompleter(fsm, widget.filename)); |