summaryrefslogtreecommitdiffstats
path: root/src/gui/dialogs/qdialog.cpp
diff options
context:
space:
mode:
authorJan-Arve Sæther <jan-arve.saether@nokia.com>2009-10-09 06:51:12 (GMT)
committerJan-Arve Sæther <jan-arve.saether@nokia.com>2009-10-09 06:51:12 (GMT)
commit80892f907be2f271d567d902c2b3d909b0178853 (patch)
treeb965540aa9a4d09d9c378acdcfb39551d7d7d79a /src/gui/dialogs/qdialog.cpp
parentdb1162da76f1d257ba9bfcaef574275e7430385f (diff)
parentf370b5d986529155baf7d9dd95678854df4105e0 (diff)
downloadQt-80892f907be2f271d567d902c2b3d909b0178853.zip
Qt-80892f907be2f271d567d902c2b3d909b0178853.tar.gz
Qt-80892f907be2f271d567d902c2b3d909b0178853.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/dialogs/qdialog.cpp')
-rw-r--r--src/gui/dialogs/qdialog.cpp22
1 files changed, 0 insertions, 22 deletions
diff --git a/src/gui/dialogs/qdialog.cpp b/src/gui/dialogs/qdialog.cpp
index 7df49fa..ed2d676 100644
--- a/src/gui/dialogs/qdialog.cpp
+++ b/src/gui/dialogs/qdialog.cpp
@@ -673,28 +673,6 @@ void QDialog::keyPressEvent(QKeyEvent *e)
case Qt::Key_Escape:
reject();
break;
- case Qt::Key_Up:
- case Qt::Key_Left:
- if (focusWidget() &&
- (focusWidget()->focusPolicy() == Qt::StrongFocus ||
- focusWidget()->focusPolicy() == Qt::WheelFocus)) {
- e->ignore();
- break;
- }
- // call ours, since c++ blocks us from calling the one
- // belonging to focusWidget().
- focusNextPrevChild(false);
- break;
- case Qt::Key_Down:
- case Qt::Key_Right:
- if (focusWidget() &&
- (focusWidget()->focusPolicy() == Qt::StrongFocus ||
- focusWidget()->focusPolicy() == Qt::WheelFocus)) {
- e->ignore();
- break;
- }
- focusNextPrevChild(true);
- break;
default:
e->ignore();
return;