summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-07-07 15:43:53 +0200
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-07-07 15:57:32 +0200
commit5f48e2a16b0b64536a205320fbf7a22f7461d80d (patch)
treedddec8017c2b68487fa62c855029f206851f65bd /src
parente348e7b633ff3a0279d4d1759e35f0920afcc3e0 (diff)
Fixes a crash when scrolling a scrollarea with a mouse wheel.
This fixes a crashed introduced in 60e965fd35037f4a27816d2aeccafdff0d6ae9d6 - those lines were removed by accident. Reviewed-by: João Abecasis Author: João Abecasis
Diffstat (limited to 'src')
-rw-r--r--src/gui/kernel/qwidget.cpp1
-rw-r--r--src/gui/widgets/qabstractscrollarea.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 611cb44841..d1ab45a918 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -7484,6 +7484,7 @@ bool QWidget::event(QEvent *event)
#ifndef QT_NO_WHEELEVENT
case QEvent::Wheel:
#endif
+ return false;
default:
break;
}
diff --git a/src/gui/widgets/qabstractscrollarea.cpp b/src/gui/widgets/qabstractscrollarea.cpp
index d952ab0719..e78f5a791a 100644
--- a/src/gui/widgets/qabstractscrollarea.cpp
+++ b/src/gui/widgets/qabstractscrollarea.cpp
@@ -937,6 +937,7 @@ bool QAbstractScrollArea::event(QEvent *e)
case QEvent::DragMove:
case QEvent::DragLeave:
#endif
+ return false;
case QEvent::StyleChange:
case QEvent::LayoutDirectionChange:
case QEvent::ApplicationLayoutDirectionChange: