diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-08 00:36:29 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-08 00:36:29 (GMT) |
| commit | 75fd46451cabd680d16913d5dfd4733c09db3459 (patch) | |
| tree | ff705d7f0df9382750005a39d284ad3c0200df5b /src/corelib/global | |
| parent | a43c406311e4888b2a1d8a6bbf099041022c7e54 (diff) | |
| parent | baaa5ae00038c34c8a7539229cda083a8afde280 (diff) | |
| download | Qt-75fd46451cabd680d16913d5dfd4733c09db3459.zip Qt-75fd46451cabd680d16913d5dfd4733c09db3459.tar.gz Qt-75fd46451cabd680d16913d5dfd4733c09db3459.tar.bz2 | |
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 bug fix: fix auto test regressions
Cocoa: p1 bug fix: revert use of subWindowStacking
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 1 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 8 |
2 files changed, 0 insertions, 9 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 864d4a5..4d70744 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -525,7 +525,6 @@ 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 c495d6f..22ad83b 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -925,14 +925,6 @@ 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. |