Merge master into api_changes

Conflicts:
	src/corelib/global/qisenum.h
	src/dbus/qdbusconnection_p.h
	src/widgets/kernel/qwidget.cpp
	tests/auto/other/qaccessibility/tst_qaccessibility.cpp

Change-Id: I85102515d5fec835832cc20ffdc5c1ba578bd01d

1 files changed, 15 insertions, 3 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index b5e8ff2246..4f95489798 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -111,8 +111,8 @@ QCocoaWindow::QCocoaWindow(QWindow *tlw)
 
 QCocoaWindow::~QCocoaWindow()
 {
-    [m_contentView release];
     clearNSWindow(m_nsWindow);
+    [m_contentView release];
     [m_nsWindow release];
 }
 
@@ -198,13 +198,17 @@ void QCocoaWindow::raise()
 {
     //qDebug() << "raise" << this;
     // ### handle spaces (see Qt 4 raise_sys in qwidget_mac.mm)
-    if (m_nsWindow)
+    if (!m_nsWindow)
+        return;
+    if ([m_nsWindow isVisible])
         [m_nsWindow orderFront: m_nsWindow];
 }
 
 void QCocoaWindow::lower()
 {
-    if (m_nsWindow)
+    if (!m_nsWindow)
+        return;
+    if ([m_nsWindow isVisible])
         [m_nsWindow orderBack: m_nsWindow];
 }
 
@@ -233,6 +237,12 @@ void QCocoaWindow::propagateSizeHints()
     }
 }
 
+void QCocoaWindow::setOpacity(qreal level)
+{
+    if (m_nsWindow)
+        [m_nsWindow setAlphaValue:level];
+}
+
 bool QCocoaWindow::setKeyboardGrabEnabled(bool grab)
 {
     if (!m_nsWindow)
@@ -439,7 +449,9 @@ void QCocoaWindow::setNSWindow(NSWindow *window)
 
 void QCocoaWindow::clearNSWindow(NSWindow *window)
 {
+    [window setDelegate:nil];
     [[NSNotificationCenter defaultCenter] removeObserver:m_contentView];
+    [m_contentView removeFromSuperviewWithoutNeedingDisplay];
 }
 
 // Returns the current global screen geometry for the nswindow associated with this window.