diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-06 17:09:27 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-06 17:09:27 (GMT) |
| commit | 7ee944a14582cd7202b4a8e94adc06e7ae5855a6 (patch) | |
| tree | 0684ab4a4e02dc72c2e1f5bc72baaf55f0d0310f /src/gui/kernel/qwidget_s60.cpp | |
| parent | cd58bc13a4a37543d76a79b3cee7cd95bde0a14b (diff) | |
| parent | 12d14efb2e1df3188c7c0001492f24fd193a11a9 (diff) | |
| download | Qt-7ee944a14582cd7202b4a8e94adc06e7ae5855a6.zip Qt-7ee944a14582cd7202b4a8e94adc06e7ae5855a6.tar.gz Qt-7ee944a14582cd7202b4a8e94adc06e7ae5855a6.tar.bz2 | |
Merge commit 'origin/4.6' into 4.6
Conflicts:
dist/changes-4.6.0
Diffstat (limited to 'src/gui/kernel/qwidget_s60.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget_s60.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index a6d8ed7..88cd63d 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. |