summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/cocoa/qcocoawindow.mm
diff options
context:
space:
mode:
authorIrfan Omair <irfan.omair@gmail.com>2013-02-27 15:52:25 -0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-14 07:31:00 +0100
commitba75f604499d3c4fc15930731814fdb9415fdc83 (patch)
tree7b13331e8fb866d91b2378fcc7144ad95829a5bc /src/plugins/platforms/cocoa/qcocoawindow.mm
parent2a388e503f49cb8e33d023e66e835cea9990df6f (diff)
Set StyleMask to NSBorderless if FramelessWindowHint is set.
Task-number: QTBUG-29815 Change-Id: Idb93843a2ad8332c81587c245fe73aa2bf5cc661 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoawindow.mm')
-rw-r--r--src/plugins/platforms/cocoa/qcocoawindow.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index 30b6d6d84a..467025c77b 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -378,7 +378,7 @@ NSUInteger QCocoaWindow::windowStyleMask(Qt::WindowFlags flags)
NSInteger styleMask = NSBorderlessWindowMask;
if ((type & Qt::Popup) == Qt::Popup) {
- if (!windowIsPopupType(type))
+ if (!windowIsPopupType(type) && !(flags & Qt::FramelessWindowHint))
styleMask = (NSUtilityWindowMask | NSResizableWindowMask | NSClosableWindowMask |
NSMiniaturizableWindowMask | NSTitledWindowMask);
} else {