summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-02-16 12:48:19 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-02-16 12:48:19 (GMT)
commit80d33cec47b8188efd473070acb5ebcc1e772583 (patch)
tree9a7598f78634a9d9da57c2f947d5cfd424c52d21
parent554d74cb9007b6ab7cecbcaf99cba0a068d2b223 (diff)
parent08ec00c081ce51a924c65df3998657174f9428b6 (diff)
downloadQt-80d33cec47b8188efd473070acb5ebcc1e772583.zip
Qt-80d33cec47b8188efd473070acb5ebcc1e772583.tar.gz
Qt-80d33cec47b8188efd473070acb5ebcc1e772583.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1
-rw-r--r--src/gui/kernel/qwidget_mac.mm2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index 0ce369d..9e642b9 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -3348,6 +3348,8 @@ void QWidgetPrivate::show_sys()
bool realWindow = isRealWindow();
#ifndef QT_MAC_USE_COCOA
if (realWindow && !q->testAttribute(Qt::WA_Moved)) {
+ if (qt_mac_is_macsheet(q))
+ recreateMacWindow();
q->createWinId();
if (QWidget *p = q->parentWidget()) {
p->createWinId();