summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@nokia.com>2009-04-07 10:50:32 (GMT)
committerThomas Hartmann <Thomas.Hartmann@nokia.com>2009-04-07 10:50:32 (GMT)
commitc1c30037292711f0fb05677e77ed2eb2112eca78 (patch)
treefbe494509e2dac75f722c295c12acca7e900e6bf
parent467b23fcff9f25a14abf051edfb2373c36172fc9 (diff)
downloadQt-c1c30037292711f0fb05677e77ed2eb2112eca78.zip
Qt-c1c30037292711f0fb05677e77ed2eb2112eca78.tar.gz
Qt-c1c30037292711f0fb05677e77ed2eb2112eca78.tar.bz2
Fixes: WDestructiveClose flag and the new WindowCancelButtonHint have the same value -> crash on SetTitle()
Task: 242484 RevBy: mauricek AutoTest: Details: Since we do not respect binary compatibility on Windows CE we just change the enum
-rw-r--r--src/corelib/global/qnamespace.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index fb7fa0c..a519f4a 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -280,9 +280,7 @@ public:
WindowStaysOnTopHint = 0x00040000,
// reserved for Qt3Support:
// WMouseNoMask = 0x00080000,
- WindowOkButtonHint = 0x00080000,
// WDestructiveClose = 0x00100000,
- WindowCancelButtonHint = 0x00100000,
// WStaticContents = 0x00200000,
// WGroupLeader = 0x00400000,
// WShowModal = 0x00800000,
@@ -291,7 +289,9 @@ public:
WindowStaysOnBottomHint = 0x04000000,
WindowCloseButtonHint = 0x08000000,
MacWindowToolBarButtonHint = 0x10000000,
- BypassGraphicsProxyWidget = 0x20000000
+ BypassGraphicsProxyWidget = 0x20000000,
+ WindowOkButtonHint = 0x00080000,
+ WindowCancelButtonHint = 0x00100000
#ifdef QT3_SUPPORT
,