summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dietrich-de@nokia.com>2010-02-01 17:03:06 (GMT)
committerGabriel de Dietrich <gabriel.dietrich-de@nokia.com>2010-02-01 17:41:15 (GMT)
commit94f5f21ac88de0d940d6ac27d222f1ef8e66d939 (patch)
treeeeb9fb223894bbb646de372cf60e0adc8d40a395 /src/gui/kernel
parentafe0f17eb5974adbedd1bc1f2fcd98459d92df47 (diff)
downloadQt-94f5f21ac88de0d940d6ac27d222f1ef8e66d939.zip
Qt-94f5f21ac88de0d940d6ac27d222f1ef8e66d939.tar.gz
Qt-94f5f21ac88de0d940d6ac27d222f1ef8e66d939.tar.bz2
Assert failure when setting a widget focus proxy as its successor in tab order
Now we check that and skip it from the tab list. Auto-test included. Reviewed-by: leo Task-number: QTBUG-7532
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;