diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-08 16:06:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-08 16:06:51 (GMT) |
| commit | f6f2d03b2d74b236d33a5ca32a49f138bf521c13 (patch) | |
| tree | f81b90ddc4f2b34bf0e9a56bbebbebb1dac9cc7d /src/corelib | |
| parent | 7c8980ee041e874a6c430f01b2daff4955517b03 (diff) | |
| parent | 75fd46451cabd680d16913d5dfd4733c09db3459 (diff) | |
| download | Qt-f6f2d03b2d74b236d33a5ca32a49f138bf521c13.zip Qt-f6f2d03b2d74b236d33a5ca32a49f138bf521c13.tar.gz Qt-f6f2d03b2d74b236d33a5ca32a49f138bf521c13.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/corelib')
| -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 8a3a04d..f015ed0 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, WA_MacNoShadow = 133, diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 903e57e..07a9503 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -929,14 +929,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. |