diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-27 09:00:05 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-27 09:00:05 (GMT) |
commit | 137828d220a219fe0061afc56f2522e9e3d1ee79 (patch) | |
tree | 88ecd1e8c101c2ba19aea00075e3a123baf6a894 /src/gui/kernel/qwidget_s60.cpp | |
parent | bc2b222148648354fe15a6f8da9e01743a1e3e3f (diff) | |
parent | 19d0a365dd99dc1a108e58949f7d0f49bac72623 (diff) | |
download | Qt-137828d220a219fe0061afc56f2522e9e3d1ee79.zip Qt-137828d220a219fe0061afc56f2522e9e3d1ee79.tar.gz Qt-137828d220a219fe0061afc56f2522e9e3d1ee79.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/kernel/qwidget_s60.cpp')
-rw-r--r-- | src/gui/kernel/qwidget_s60.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index b1c37d3..359df2a 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -488,12 +488,6 @@ void QWidgetPrivate::show_sys() if(q->isWindow()) id->setFocusSafely(true); - - // Force setting of the icon after window is made visible, - // this is needed even WA_SetWindowIcon is not set, as in that case we need - // to reset to the application level window icon - if(q->isWindow()) - setWindowIcon_sys(true); } invalidateBuffer(q->rect()); @@ -1180,18 +1174,6 @@ void QWidget::destroy(bool destroyWindow, bool destroySubWindows) if (id->IsFocused()) // Avoid unnecessry calls to FocusChanged() id->setFocusSafely(false); id->ControlEnv()->AppUi()->RemoveFromStack(id); - - // Hack to activate window under destroyed one. With this activation - // the next visible window will get keyboard focus - WId wid = CEikonEnv::Static()->AppUi()->TopFocusedControl(); - if (wid) { - QWidget *widget = QWidget::find(wid); - QApplication::setActiveWindow(widget); - if (widget) { - // Reset global window title for focusing window - widget->d_func()->setWindowTitle_sys(widget->windowTitle()); - } - } } } |