diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2012-01-31 07:14:28 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-02 08:58:20 (GMT) |
| commit | fb7e4ff9855bab4b06583f65198247ccfcc6599a (patch) | |
| tree | 141fa8034b1409aab165b1caae40da9aea5bb8e7 /src/activeqt | |
| parent | b5871311457ca97816c0abbb8b935570bbfb657c (diff) | |
| download | Qt-fb7e4ff9855bab4b06583f65198247ccfcc6599a.zip Qt-fb7e4ff9855bab4b06583f65198247ccfcc6599a.tar.gz Qt-fb7e4ff9855bab4b06583f65198247ccfcc6599a.tar.bz2 | |
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>
(cherry picked from commit c36006f45fdcbdb97cbc3179c4ecc25203898fc5)
Diffstat (limited to 'src/activeqt')
| -rw-r--r-- | src/activeqt/container/qaxwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp index e07099a..92a1e11 100644 --- a/src/activeqt/container/qaxwidget.cpp +++ b/src/activeqt/container/qaxwidget.cpp @@ -2148,7 +2148,7 @@ QSize QAxWidget::minimumSizeHint() const */ void QAxWidget::changeEvent(QEvent *e) { - if (isNull()) + if (isNull() || !container) return; switch (e->type()) { |