diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-28 08:56:44 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-28 08:58:49 +0200 |
commit | be35b70ca1bf61d022f7dee9df4aaccbf715b25e (patch) | |
tree | dd59ae3713b2bc516101f921491292a8b2c295e3 /src/plugins/platforms/cocoa/qcocoawindow.mm | |
parent | cc54161abb977751b4499c559fc0f464b9e2399e (diff) | |
parent | 572200989b224ad68e7b8ae4c0aecceb6ca871a2 (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoawindow.mm')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.mm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index 9c2a301bba..cc72f050d2 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -238,6 +238,8 @@ QCocoaWindow::QCocoaWindow(QWindow *tlw) setGeometry(tlw->geometry()); recreateWindow(parent()); tlw->setGeometry(geometry()); + if (tlw->isTopLevel()) + setWindowIcon(tlw->icon()); m_inConstructor = false; } |