summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Petersson <martin.petersson@nokia.com>2011-03-10 14:07:15 (GMT)
committerQt Commercial Integration <QtCommercial@digia.com>2012-01-31 10:24:47 (GMT)
commit68f5137da595dd8e1623568ac7ccd71c0f0701fb (patch)
tree6634fbae050562791554fc34efc0e54ab1bb5453
parent1bf840e2feba3bd073945eba81fb7bd62ccb2a99 (diff)
downloadQt-68f5137da595dd8e1623568ac7ccd71c0f0701fb.zip
Qt-68f5137da595dd8e1623568ac7ccd71c0f0701fb.tar.gz
Qt-68f5137da595dd8e1623568ac7ccd71c0f0701fb.tar.bz2
Mac: Center the Window title on Cocoa.
Task-number: QTBUG-13593 Reviewed-by: Richard Moe Gustavsen
-rw-r--r--src/gui/kernel/qwidget_mac.mm2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index 9481a85..a2e868d 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -3214,6 +3214,8 @@ void QWidgetPrivate::setWindowIcon_sys(bool forceReset)
ReleaseIconRef(previousIcon);
#else
QMacCocoaAutoReleasePool pool;
+ if (icon.isNull())
+ return;
NSButton *iconButton = [qt_mac_window_for(q) standardWindowButton:NSWindowDocumentIconButton];
if (iconButton == nil) {
QCFString string(q->windowTitle());