summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGareth Stockwell <gareth.stockwell@accenture.com>2009-10-20 16:50:11 (GMT)
committerGareth Stockwell <gareth.stockwell@accenture.com>2009-10-22 11:21:18 (GMT)
commitd5b4afa7b63bb5e0d6afb3491e5fd62e7bf2e890 (patch)
treef13dc2cdaa86d7c3f783a31ab40d8c92c959bc24
parent9bdc0a2d18bcc4938d79079e184a05acd5f43b22 (diff)
downloadQt-d5b4afa7b63bb5e0d6afb3491e5fd62e7bf2e890.zip
Qt-d5b4afa7b63bb5e0d6afb3491e5fd62e7bf2e890.tar.gz
Qt-d5b4afa7b63bb5e0d6afb3491e5fd62e7bf2e890.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
-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 abf5ba5..2cc3d3f 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.