diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-07-06 16:47:11 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-07-07 14:40:54 +0000 |
| commit | 323514051762d6e0385a6a2474837126d2a7cc3c (patch) | |
| tree | 08e945ed54d162864c071d57d412cd3196b9ead3 /src/plugins/platforms/cocoa | |
| parent | ecb84788191a06b503028aa89820a3b6ae0e45da (diff) | |
macOS: Remove explicit call to setWindowIcon in QCocoaWindow ctor
Window setup should happen in QCocoaWindow::recreateWindowIfNeeded(),
and there we already call setWindowFilePath(), which takes care of
setting the window icon.
Change-Id: Iaa2f42c694cf8d251703cc56648e5819edd79bec
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.mm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index 9e168835f1..410472ac2c 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -199,8 +199,6 @@ void QCocoaWindow::initialize() recreateWindowIfNeeded(); window()->setGeometry(geometry()); - if (window()->isTopLevel()) - setWindowIcon(window()->icon()); m_initialized = true; } @@ -1315,7 +1313,7 @@ void QCocoaWindow::recreateWindowIfNeeded() propagateSizeHints(); setWindowFlags(window()->flags()); setWindowTitle(window()->title()); - setWindowFilePath(window()->filePath()); + setWindowFilePath(window()->filePath()); // Also sets window icon setWindowState(window()->windowState()); } else { // Child windows have no NSWindow, link the NSViews instead. |