diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-06-03 10:07:01 +0200 |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-06-03 10:07:01 +0200 |
commit | 7d9fcaccb1e6e056336b9ad1f7f89afac4699aee (patch) | |
tree | 7d41572b6a9f1d1306f133ed0d401eadc74dbdcc /src/widgets | |
parent | 504ab89c6a94c32d61ca45809ee618a8982577a4 (diff) |
Prevent crash in tst_QWidget::persistentWinId().
Only call createWinId() if we have a parent widget set.
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/kernel/qwidget_qpa.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp index ccfec7c0a1..b8a7cb5463 100644 --- a/src/widgets/kernel/qwidget_qpa.cpp +++ b/src/widgets/kernel/qwidget_qpa.cpp @@ -234,7 +234,7 @@ void QWidgetPrivate::setParent_sys(QWidget *newparent, Qt::WindowFlags f) if (!(f&Qt::Window) && (oldFlags&Qt::Window) && !q->testAttribute(Qt::WA_NativeWindow)) { //qDebug() << "setParent_sys() change from toplevel"; q->destroy(); - } else if (wasCreated) { + } else if (newparent && wasCreated) { q->createWinId(); } |