diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-04-15 14:26:21 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-16 19:45:11 +0200 |
| commit | 21f6ab28602dfc57cee46484dbb203cef5dd8723 (patch) | |
| tree | e1273d50306c2e2ecf9e5350f5debbdac2187200 /src | |
| parent | f5ea183cc6a6cd66fb3f804041fc112687e0a060 (diff) | |
Cocoa: Make sure no invisible proxy icon button is created
If the icon is null, don't force creation.
Task-number: QTBUG-30064
Change-Id: If639714f667fedfcc67a3393a7d75111a7dbff3f
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'src')
| -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 161e2225a4..c5babae19e 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -471,6 +471,8 @@ void QCocoaWindow::setWindowIcon(const QIcon &icon) NSButton *iconButton = [m_nsWindow standardWindowButton:NSWindowDocumentIconButton]; if (iconButton == nil) { + if (icon.isNull()) + return; NSString *title = QCFString::toNSString(window()->title()); [m_nsWindow setRepresentedURL:[NSURL fileURLWithPath:title]]; iconButton = [m_nsWindow standardWindowButton:NSWindowDocumentIconButton]; |