Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Cocoa: p1 bugfix, add widget flag MacNoCocoaChildWindow

2 files changed, 9 insertions, 0 deletions

diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 4d70744..864d4a5 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -525,6 +525,7 @@ public:
 #endif
 
         WA_X11DoNotAcceptFocus = 132,
+        WA_MacNoCocoaChildWindow = 133,
 
         // Add new attributes before this line
         WA_AttributeCount
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 22ad83b..c495d6f 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -925,6 +925,14 @@
     the brushed metal style as supported by the windowing system. This
     attribute is only applicable to Mac OS X.
 
+    \value WA_MacNoCocoaChildWindow Indicates the widget should not be added
+    as a Cocoa child window of it's parent window. This will free the window
+    from being moved around together with the parent. However, this
+    will also allow it to stack/hide behind it's parent (if they are on
+    the same window level, e.g both windows are dialogs). This can cause problems if
+    both windows are modal, as the child can then block input to the parent
+    while hiding behind it. This attribute is only applicable to Mac OS X.
+
     \omitvalue WA_MacMetalStyle
 
     \value WA_Mapped Indicates that the widget is mapped on screen.