aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToby Tomkins <toby.tomkins@nokia.com>2011-10-11 13:12:23 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-11 09:06:29 +0200
commit1fcafbebc8fcb445e3bc8d9d54f57e4ffee39f55 (patch)
tree855b05ebc24a60b19e6a11275f205de8dc9f585d
parenta00e70ef2cc7e4c265862d82976fc871035f3416 (diff)
Remove insignificant test status and explicitly mark failing test.
Task-number: QTBUG-21946 Change-Id: Idf54ad4811562634b792f973c9f1a518a09e5a4d Reviewed-on: http://codereview.qt-project.org/6375 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
-rw-r--r--tests/auto/declarative/qsgtextedit/qsgtextedit.pro2
-rw-r--r--tests/auto/declarative/qsgtextedit/tst_qsgtextedit.cpp1
2 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/declarative/qsgtextedit/qsgtextedit.pro b/tests/auto/declarative/qsgtextedit/qsgtextedit.pro
index ef4c4e2752..a205f13480 100644
--- a/tests/auto/declarative/qsgtextedit/qsgtextedit.pro
+++ b/tests/auto/declarative/qsgtextedit/qsgtextedit.pro
@@ -9,5 +9,3 @@ DEFINES += SRCDIR=\\\"$$PWD\\\"
QT += core-private gui-private v8-private declarative-private
QT += opengl-private
-
-qpa:CONFIG+=insignificant_test # QTBUG-21010, fails unstably
diff --git a/tests/auto/declarative/qsgtextedit/tst_qsgtextedit.cpp b/tests/auto/declarative/qsgtextedit/tst_qsgtextedit.cpp
index e77b786430..1a9372b1e5 100644
--- a/tests/auto/declarative/qsgtextedit/tst_qsgtextedit.cpp
+++ b/tests/auto/declarative/qsgtextedit/tst_qsgtextedit.cpp
@@ -2009,6 +2009,7 @@ void tst_qsgtextedit::openInputPanel()
QVERIFY(!edit->hasActiveFocus());
qDebug() << &edit << 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