From 323514051762d6e0385a6a2474837126d2a7cc3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 6 Jul 2018 16:47:11 +0200 Subject: macOS: Remove explicit call to setWindowIcon in QCocoaWindow ctor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/plugins/platforms/cocoa/qcocoawindow.mm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src') 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. -- cgit v1.2.3