summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorGareth Stockwell <gareth.stockwell@accenture.com>2009-10-20 16:50:11 (GMT)
committerFrans Englich <frans.englich@nokia.com>2009-10-23 13:50:50 (GMT)
commitdf0f099b7ae0ffbea46411276a239d152f36a7e2 (patch)
treea64ab4d9d87db1103a454a5a4eaa5038d5abc09f /src/gui
parent7177618fd8ae91e553573263d5dd78a99c64e118 (diff)
downloadQt-df0f099b7ae0ffbea46411276a239d152f36a7e2.zip
Qt-df0f099b7ae0ffbea46411276a239d152f36a7e2.tar.gz
Qt-df0f099b7ae0ffbea46411276a239d152f36a7e2.tar.bz2
When creating a Symbian WId for a visible widget, make the control
visible after activating the window. This change was required in order to be able to run the test case for the below task; however, it is more generally required. Without it, the contents of the descendents of this widget will not be visible, until they are explicitly hidden and then re-shown. Task-number: QTBUG-4787 Reviewed-by: axis
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kernel/qwidget_s60.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
index cb615fe..3e332a3 100644
--- a/src/gui/kernel/qwidget_s60.cpp
+++ b/src/gui/kernel/qwidget_s60.cpp
@@ -434,8 +434,10 @@ void QWidgetPrivate::create_sys(WId window, bool /* initializeWindow */, bool de
drawableWindow->PointerFilter(EPointerFilterEnterExit
| EPointerFilterMove | EPointerFilterDrag, 0);
- if (q->isVisible() && q->testAttribute(Qt::WA_Mapped))
+ if (q->isVisible() && q->testAttribute(Qt::WA_Mapped)) {
activateSymbianWindow(control.data());
+ control->MakeVisible(true);
+ }
// We wait until the control is fully constructed before calling setWinId, because
// this generates a WinIdChanged event.