summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.p.agocs@nokia.com>2011-05-27 16:06:53 +0200
committerLaszlo Agocs <laszlo.p.agocs@nokia.com>2011-05-30 14:41:13 +0200
commitef8e5af1d219dd749ea306230cfd097cc2595cb4 (patch)
tree5302f29027ce868d9e34710f321a4a64a1c34667 /src/corelib
parentb48abb631f0e7f6728e56efbcf69802fca93c84f (diff)
The proper fix for subwindow parenting issues.
The previous patch tried to work around the fact that Qt::SubWindow accidentally pulled in Qt::Window. This patch corrects the root cause of the problem.
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/global/qnamespace.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 70f13cf79f..4a663fc8a5 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -278,7 +278,7 @@ public:
ToolTip = Popup | Sheet,
SplashScreen = ToolTip | Dialog,
Desktop = 0x00000010 | Window,
- SubWindow = Desktop | Dialog,
+ SubWindow = 0x00000012,
WindowType_Mask = 0x000000ff,
MSWindowsFixedSizeDialogHint = 0x00000100,