summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Griebl <rgriebl@trolltech.com>2010-03-03 14:58:18 (GMT)
committerRobert Griebl <rgriebl@trolltech.com>2010-03-03 15:07:33 (GMT)
commit48dc16b34586f7dca8bf513f6447c97543801814 (patch)
tree3e3373be22d761b0681c1ccf655b0d7fb89a7d56
parent4a961ad412846af126ece6d9e2385e3ebe009d72 (diff)
downloadQt-48dc16b34586f7dca8bf513f6447c97543801814.zip
Qt-48dc16b34586f7dca8bf513f6447c97543801814.tar.gz
Qt-48dc16b34586f7dca8bf513f6447c97543801814.tar.bz2
Block the Maemo5 window attribute values from being assigned to something else on other platforms.
Reviewed-By: Harald Fernengel
-rw-r--r--src/corelib/global/qnamespace.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 6ee8ae9..d2546a7 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -500,6 +500,14 @@ 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,
+ WA_Maemo5PortraitOrientation = 128,
+ WA_Maemo5LandscapeOrientation = 129,
+ WA_Maemo5AutoOrientation = 130,
+ WA_Maemo5ShowProgressIndicator = 131,
+#endif
// Add new attributes before this line
WA_AttributeCount
};