aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToby Tomkins <toby.tomkins@nokia.com>2011-10-11 17:53:10 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-12 03:38:54 +0200
commit25a743d84808d8d157fee69ed54fc9ac976c96ac (patch)
tree2b91d0df949f72b6d881b08be379d053c6b00b61
parent6584ad8e6170cb9597246115eda7224251a40000 (diff)
Remove insignificant test status and explicitly mark failing test.
Task-number: QTBUG-21946 Change-Id: If1837a23041b52dc1f148821f483281975626d79 Reviewed-on: http://codereview.qt-project.org/6374 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
-rw-r--r--tests/auto/declarative/qsgtextinput/qsgtextinput.pro1
-rw-r--r--tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/declarative/qsgtextinput/qsgtextinput.pro b/tests/auto/declarative/qsgtextinput/qsgtextinput.pro
index b949247c7d..8c7d67cc1e 100644
--- a/tests/auto/declarative/qsgtextinput/qsgtextinput.pro
+++ b/tests/auto/declarative/qsgtextinput/qsgtextinput.pro
@@ -6,5 +6,4 @@ SOURCES += tst_qsgtextinput.cpp
DEFINES += SRCDIR=\\\"$$PWD\\\"
-CONFIG += insignificant_test
QT += core-private gui-private v8-private declarative-private opengl-private testlib
diff --git a/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp b/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp
index b0f8eafc1a..26638c14aa 100644
--- a/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp
+++ b/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp
@@ -266,7 +266,6 @@ void tst_qsgtextinput::width()
QVERIFY(textinputObject != 0);
int delta = abs(int(int(textinputObject->width()) - metricWidth));
- QEXPECT_FAIL("", "QTBUG-21689", Abort);
QVERIFY(delta <= 3.0); // As best as we can hope for cross-platform.
delete textinputObject;
@@ -2097,6 +2096,7 @@ void tst_qsgtextinput::openInputPanel()
QVERIFY(!input->hasActiveFocus());
qDebug() << &input << qApp->inputPanel()->inputItem();
QCOMPARE(qApp->inputPanel()->inputItem(), static_cast<QObject*>(0));
+ QEXPECT_FAIL("", "QTBUG-21946", Abort);
QCOMPARE(qApp->inputPanel()->visible(), false);
// input panel should open on focus