diff options
| author | Robin Burchell <robin.burchell@collabora.com> | 2011-12-15 10:41:22 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-18 15:15:21 +0100 |
| commit | 3992c1cb1557421d85800201558a12d426acb16e (patch) | |
| tree | f303ba2a9b23376f69124b715399a90e5b6c188b | |
| parent | eada3449b9914a3c1cee005245b90631c617a787 (diff) | |
Remove note about Maemo5-reserved enum values, and renumber appropriately.
With the ABI/API break, we can afford to do this.
Change-Id: Iaf318a56d572679322fde0448556eaa4242842d1
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| -rw-r--r-- | src/corelib/global/qnamespace.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 456be48d9c..b1d8ed46b6 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -461,20 +461,8 @@ public: WA_MergeSoftkeys = 124, WA_MergeSoftkeysRecursively = 125, -#if 0 // these values are reserved for Maemo5 - do not re-use them - WA_Maemo5NonComposited = 126, - WA_Maemo5StackedWindow = 127, -#endif - -#if 0 // these values are reserved for Maemo5 - do not re-use them - WA_Maemo5PortraitOrientation = WA_LockPortraitOrientation, - WA_Maemo5LandscapeOrientation = WA_LockLandscapeOrientation, - WA_Maemo5AutoOrientation = WA_AutoOrientation, - WA_Maemo5ShowProgressIndicator = 131, -#endif - - WA_X11DoNotAcceptFocus = 132, - WA_MacNoShadow = 134, + WA_X11DoNotAcceptFocus = 126, + WA_MacNoShadow = 127, // Add new attributes before this line WA_AttributeCount |