summaryrefslogtreecommitdiffstats
path: root/tests/auto/qwidget
diff options
context:
space:
mode:
authorBill King <bill.king@nokia.com>2009-07-13 04:01:25 (GMT)
committerBill King <bill.king@nokia.com>2009-07-13 04:01:25 (GMT)
commitb7d274c1fc818b347ff9256a00e4f667f0bd1556 (patch)
tree2e8b9d6d920064b91a236aee1fd518f3c5b7c3ab /tests/auto/qwidget
parentc402f363d8502c688433eb4f21ba3528d9ac89e5 (diff)
parentde07df9001586cc18ae267591359541b7ea494a0 (diff)
downloadQt-b7d274c1fc818b347ff9256a00e4f667f0bd1556.zip
Qt-b7d274c1fc818b347ff9256a00e4f667f0bd1556.tar.gz
Qt-b7d274c1fc818b347ff9256a00e4f667f0bd1556.tar.bz2
Merge commit 'origin/4.5'
Conflicts: src/plugins/kbddrivers/usb/main.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qwidget/tst_qwidget.cpp
Diffstat (limited to 'tests/auto/qwidget')
-rw-r--r--tests/auto/qwidget/tst_qwidget.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index fa36496..0f0a1af 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -351,6 +351,7 @@ private slots:
#endif
void updateOnDestroyedSignal();
void toplevelLineEditFocus();
+ void inputFocus_task257832();
void focusWidget_task254563();
void rectOutsideCoordinatesLimit_task144779();
@@ -9152,5 +9153,19 @@ void tst_QWidget::rectOutsideCoordinatesLimit_task144779()
QCOMPARE(pixmap.toImage().copy(center), correct.toImage().copy(center));
}
+void tst_QWidget::inputFocus_task257832()
+{
+ QLineEdit *widget = new QLineEdit;
+ QInputContext *context = widget->inputContext();
+ if (!context)
+ QSKIP("No input context", SkipSingle);
+ widget->setFocus();
+ context->setFocusWidget(widget);
+ QCOMPARE(context->focusWidget(), widget);
+ widget->setReadOnly(true);
+ QVERIFY(!context->focusWidget());
+ delete widget;
+}
+
QTEST_MAIN(tst_QWidget)
#include "tst_qwidget.moc"