summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-11-16 21:55:08 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-11-16 21:55:08 (GMT)
commit499a9aaabad0756cbca7b39751684308a6ba88ea (patch)
treeeed49fa9e11c74fd29ea9c3cb093ed9e07a27654 /src/3rdparty/webkit
parent8586237d9400c5669e62e97bfb00b4a2579c7646 (diff)
downloadQt-499a9aaabad0756cbca7b39751684308a6ba88ea.zip
Qt-499a9aaabad0756cbca7b39751684308a6ba88ea.tar.gz
Qt-499a9aaabad0756cbca7b39751684308a6ba88ea.tar.bz2
Fix inputMethods QWebPage autotest failure.
Skip the part that tests for Qt::ImFont after the earlier patch that resolves the returned fonts. We can't query for the generic family anymore in this test. Reviewed-by: Trust me
Diffstat (limited to 'src/3rdparty/webkit')
-rw-r--r--src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index 090379c..7fc3640 100644
--- a/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -1404,9 +1404,9 @@ void tst_QWebPage::inputMethods()
QVERIFY(inputs.at(0).geometry().contains(variant.toRect().topLeft()));
//ImFont
- variant = page->inputMethodQuery(Qt::ImFont);
- QFont font = variant.value<QFont>();
- QCOMPARE(QString("-webkit-serif"), font.family());
+ //variant = page->inputMethodQuery(Qt::ImFont);
+ //QFont font = variant.value<QFont>();
+ //QCOMPARE(QString("-webkit-serif"), font.family());
QList<QInputMethodEvent::Attribute> inputAttributes;