summaryrefslogtreecommitdiff
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@nokia.com>2009-06-10 13:30:30 +0200
committerThomas Hartmann <Thomas.Hartmann@nokia.com>2009-06-10 13:32:22 +0200
commitb0192e2cdf10313799cfda63d93361669e752645 (patch)
tree4a7d736f90d3d343f6c3e03545f0e50d5b245bc1 /src/gui/kernel
parentd8280ea0af9fc8fabd4a7fc02e2df4464b1bc3d4 (diff)
downloadqt4-tools-b0192e2cdf10313799cfda63d93361669e752645.tar.gz
Compilefix for QT_NO_TABLETEVENT and QT_NO_COMPLETER
Task-number: 253086 Reviewed-by: Joerg
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qapplication.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 4cf0ad71ba..9a3f26604a 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