summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2009-10-19 12:19:56 (GMT)
committerJoerg Bornemann <joerg.bornemann@nokia.com>2009-10-19 15:23:43 (GMT)
commit93a6da9a9b14bc2ff637c6756bbb467f58f6200b (patch)
treef9a11af19f598069ae570ac58bb0dc19fff48b09
parent3908a76b470632f943e836342591319b454d785b (diff)
downloadQt-93a6da9a9b14bc2ff637c6756bbb467f58f6200b.zip
Qt-93a6da9a9b14bc2ff637c6756bbb467f58f6200b.tar.gz
Qt-93a6da9a9b14bc2ff637c6756bbb467f58f6200b.tar.bz2
fix bug in tst_qwidget.cpp
WinIdChangeEventWidget::event didn't return a value in all codepaths. Reviewed-by: thartman
-rw-r--r--tests/auto/qwidget/tst_qwidget.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index 758821b..1b898f4 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -4362,11 +4362,13 @@ public:
}
protected:
- bool event(QEvent *e){
- if(e->type() == QEvent::WinIdChange)
+ bool event(QEvent *e)
+ {
+ if (e->type() == QEvent::WinIdChange) {
++m_winIdChangeEventCount;
- else
- return QWidget::event(e);
+ return true;
+ }
+ return QWidget::event(e);
}
public:
int m_winIdChangeEventCount;