diff options
| author | Sami Merila <sami.merila@nokia.com> | 2010-07-01 08:07:14 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2010-07-01 08:07:52 (GMT) |
| commit | cb2b4a12ac17adf56074d3630efe4feb50ae0e2b (patch) | |
| tree | eaa4335e45699cbb698f42a43712039bd63ccf7c /src/gui/kernel | |
| parent | 30ef2af599f85fef56b975f45fd4edfe817a449a (diff) | |
| parent | d3ae6c620876e08ed130606709c208f7352b2f81 (diff) | |
| download | Qt-cb2b4a12ac17adf56074d3630efe4feb50ae0e2b.zip Qt-cb2b4a12ac17adf56074d3630efe4feb50ae0e2b.tar.gz Qt-cb2b4a12ac17adf56074d3630efe4feb50ae0e2b.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 8 | ||||
| -rw-r--r-- | src/gui/kernel/qwidget_win.cpp | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index a9bb691..e57ec77 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -2861,9 +2861,11 @@ void QWidgetPrivate::setParent_sys(QWidget *parent, Qt::WindowFlags f) } if (wasWindow) { oldToolbar = [oldWindow toolbar]; - [oldToolbar retain]; - oldToolbarVisible = [oldToolbar isVisible]; - [oldWindow setToolbar:nil]; + if (oldToolbar) { + [oldToolbar retain]; + oldToolbarVisible = [oldToolbar isVisible]; + [oldWindow setToolbar:nil]; + } } #endif } diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp index 9c65aa0..0f05c6b 100644 --- a/src/gui/kernel/qwidget_win.cpp +++ b/src/gui/kernel/qwidget_win.cpp @@ -1167,7 +1167,7 @@ void QWidgetPrivate::show_sys() // This is to resolve the problem where popups are opened from the // system tray and not being implicitly activated if (q->windowType() == Qt::Popup && - (!q->parentWidget() || !q->parentWidget()->isActiveWindow())) + !q->parentWidget() && !qApp->activeWindow()) q->activateWindow(); } |