summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@digia.com>2012-01-31 08:14:28 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-31 10:55:14 +0100
commitc36006f45fdcbdb97cbc3179c4ecc25203898fc5 (patch)
tree83a59b8e28186e4b115f8728355258a0fb74f588 /src
parent75a00446bc6634144e6de7e83789aced73ec3306 (diff)
downloadqtactiveqt-c36006f45fdcbdb97cbc3179c4ecc25203898fc5.tar.gz
Fix a crash when changeEvent() is called and there is no container
When changeEvent() was called and no container had been set up then it would crash because it uses container without checking if it exists. Task-number: QTBUG-23957 Change-Id: I67393bf5c9bc5b437b92ee2c1b72ffbd5cd12af3 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/activeqt/container/qaxwidget.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp
index cb01a59..5419c17 100644
--- a/src/activeqt/container/qaxwidget.cpp
+++ b/src/activeqt/container/qaxwidget.cpp
@@ -2181,7 +2181,7 @@ QSize QAxWidget::minimumSizeHint() const
*/
void QAxWidget::changeEvent(QEvent *e)
{
- if (isNull())
+ if (isNull() || !container)
return;
switch (e->type()) {