diff options
| author | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2009-06-10 11:30:30 (GMT) |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2009-06-10 11:32:22 (GMT) |
| commit | b0192e2cdf10313799cfda63d93361669e752645 (patch) | |
| tree | 4a7d736f90d3d343f6c3e03545f0e50d5b245bc1 | |
| parent | d8280ea0af9fc8fabd4a7fc02e2df4464b1bc3d4 (diff) | |
| download | Qt-b0192e2cdf10313799cfda63d93361669e752645.zip Qt-b0192e2cdf10313799cfda63d93361669e752645.tar.gz Qt-b0192e2cdf10313799cfda63d93361669e752645.tar.bz2 | |
Compilefix for QT_NO_TABLETEVENT and QT_NO_COMPLETER
Task-number: 253086
Reviewed-by: Joerg
| -rw-r--r-- | src/gui/dialogs/qfiledialog_p.h | 3 | ||||
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/gui/dialogs/qfiledialog_p.h b/src/gui/dialogs/qfiledialog_p.h index ab4199e..a393ec7 100644 --- a/src/gui/dialogs/qfiledialog_p.h +++ b/src/gui/dialogs/qfiledialog_p.h @@ -275,7 +275,10 @@ public: // data QStringList watching; QFileSystemModel *model; + +#ifndef QT_NO_COMPLETER QFSCompletor *completer; +#endif //QT_NO_COMPLETER QFileDialog::FileMode fileMode; QFileDialog::AcceptMode acceptMode; diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 4cf0ad7..9a3f266 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -3566,10 +3566,12 @@ bool QApplication::notify(QObject *receiver, QEvent *e) #if !defined(QT_NO_WHEELEVENT) || !defined(QT_NO_TABLETEVENT) else if ( # ifndef QT_NO_WHEELEVENT - e->type() == QEvent::Wheel || + e->type() == QEvent::Wheel +# else + false # endif # ifndef QT_NO_TABLETEVENT - e->type() == QEvent::TabletMove + || e->type() == QEvent::TabletMove || e->type() == QEvent::TabletPress || e->type() == QEvent::TabletRelease # endif |