diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 10:53:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 10:53:11 (GMT) |
| commit | bfa6ac28c57d62f9add7fa27f029eac7f3835fab (patch) | |
| tree | 4d9fd321d9e15a135af15e06664f26165fa908e8 /src | |
| parent | 959e9227371efc58c76f6a6c265744d9c3227a4b (diff) | |
| parent | 877bb2132bdd94a62526a5fea6a7e5f6f813395e (diff) | |
| download | Qt-bfa6ac28c57d62f9add7fa27f029eac7f3835fab.zip Qt-bfa6ac28c57d62f9add7fa27f029eac7f3835fab.tar.gz Qt-bfa6ac28c57d62f9add7fa27f029eac7f3835fab.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QWidgetPrivate::setParent_sys might be using null pointer
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qwidget_s60.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index 1dd1477..8ca29cd 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -782,7 +782,7 @@ void QWidgetPrivate::setParent_sys(QWidget *parent, Qt::WindowFlags f) adjustFlags(data.window_flags, q); // keep compatibility with previous versions, we need to preserve the created state // (but we recreate the winId for the widget being reparented, again for compatibility) - if (wasCreated || (!q->isWindow() && parent->testAttribute(Qt::WA_WState_Created))) + if (wasCreated || (!q->isWindow() && parent && parent->testAttribute(Qt::WA_WState_Created))) createWinId(); if (q->isWindow() || (!parent || parent->isVisible()) || explicitlyHidden) q->setAttribute(Qt::WA_WState_Hidden); |