diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-06-25 15:20:14 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-26 13:54:13 +0200 |
| commit | b24a115706d89351d4b0ebb075e869349490b301 (patch) | |
| tree | b54a66e34486803f2dab46fd299ac4ae2301ece6 /src/plugins/platforms/cocoa | |
| parent | fb2a25e7564f4651beb955fd3ecb2e644b16d80d (diff) | |
Mac/XCB/Windows: Fix initial setting of window icons.
Setting an icon on a QWindow before creating the platform
window did not have any effect.
Task-number: QTBUG-31961
Change-Id: I8e58a3b239c8bc69af58f765e7826337463d2201
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa')
| -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 19c4faf369..057eb7e144 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -235,6 +235,8 @@ QCocoaWindow::QCocoaWindow(QWindow *tlw) setGeometry(tlw->geometry()); recreateWindow(parent()); tlw->setGeometry(geometry()); + if (tlw->isTopLevel()) + setWindowIcon(tlw->icon()); m_inConstructor = false; } |