summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorSamuel Rødal <sroedal@trolltech.com>2010-02-04 09:08:43 (GMT)
committerSamuel Rødal <sroedal@trolltech.com>2010-02-04 09:08:43 (GMT)
commit47b7af3bfd78c6d4efd3ce93be275a60430679d2 (patch)
treee7d7ff32ae72008b74df37e13caf568b33ac19b5 /src/gui/kernel
parent8e98033a67263f6a2d9155f228dc28e2faee4f5e (diff)
parent39523f9f78a7c93643924711b1ed8006ebfcf5ce (diff)
downloadQt-47b7af3bfd78c6d4efd3ce93be275a60430679d2.zip
Qt-47b7af3bfd78c6d4efd3ce93be275a60430679d2.tar.gz
Qt-47b7af3bfd78c6d4efd3ce93be275a60430679d2.tar.bz2
Merge remote branch 'staging/4.6' into 4.6
Manual resolve of conflict in changes-4.6.2 in staging-2. Conflicts: dist/changes-4.6.2
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qwidget.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index ffad38b..4054d2a 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -6414,6 +6414,8 @@ void QWidget::setTabOrder(QWidget* first, QWidget *second)
first = fp;
}
+ if (fp == second)
+ return;
if (QWidget *sp = second->focusProxy())
second = sp;