summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@nokia.com>2009-05-07 09:41:23 (GMT)
committerThomas Hartmann <Thomas.Hartmann@nokia.com>2009-05-07 09:43:56 (GMT)
commitacd6ac49150a126a08afd864210d0627487c6d3d (patch)
tree385fcbf1ce62a91b5b48d810634d2b048e4a7543
parentb7803b824905b115c8e4cfc38e353c707fbaad17 (diff)
downloadQt-acd6ac49150a126a08afd864210d0627487c6d3d.zip
Qt-acd6ac49150a126a08afd864210d0627487c6d3d.tar.gz
Qt-acd6ac49150a126a08afd864210d0627487c6d3d.tar.bz2
Fix strange context menu related bug on Windows Mobile
Fixes 245347 again and does not trigger 252319 Task-number: 245347 Reviewed-by: Maurice
-rw-r--r--src/gui/kernel/qlayout.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/gui/kernel/qlayout.cpp b/src/gui/kernel/qlayout.cpp
index 1d5a70d..4463aab 100644
--- a/src/gui/kernel/qlayout.cpp
+++ b/src/gui/kernel/qlayout.cpp
@@ -1028,8 +1028,13 @@ void QLayout::freeze(int w, int h)
void QLayout::setMenuBar(QWidget *widget)
{
Q_D(QLayout);
- if (widget)
- addChildWidget(widget);
+
+#ifdef Q_OS_WINCE_WM
+ if (widget && widget->size().height() > 0)
+#else
+ if (widget)
+#endif
+ addChildWidget(widget);
d->menubar = widget;
}