diff options
| author | J-P Nurmi <j-p.nurmi@nokia.com> | 2012-09-06 10:52:29 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-07 23:01:00 +0200 |
| commit | b630cfbaf7d970b04e9723f5d8cfbfd8d08733b2 (patch) | |
| tree | fb2e4406339f4a53b873c38498a9e242e417660a /tests | |
| parent | 7cab011a95e9a7cae2764b10c709ebfcf7a3acfe (diff) | |
tst_qquickfontloader: remove unnecessary skips on Windows
Change-Id: I319d0a5cc2387c5bc1b308e6e12a33e720a2d722
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp b/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp index b5f47a96fd..1bebb5c413 100644 --- a/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp +++ b/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp @@ -117,9 +117,6 @@ void tst_qquickfontloader::namedFont() void tst_qquickfontloader::localFont() { -#if defined(Q_OS_WIN) - QSKIP("Windows doesn't support font loading."); -#endif QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"" + testFileUrl("tarzeau_ocr_a.ttf").toString() + "\" }"; QQmlComponent component(&engine); component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); @@ -133,9 +130,6 @@ void tst_qquickfontloader::localFont() void tst_qquickfontloader::failLocalFont() { -#if defined(Q_OS_WIN) - QSKIP("Windows doesn't support font loading."); -#endif QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"" + testFileUrl("dummy.ttf").toString() + "\" }"; QTest::ignoreMessage(QtWarningMsg, QString("file::2:1: QML FontLoader: Cannot load font: \"" + testFileUrl("dummy.ttf").toString() + "\"").toUtf8().constData()); QQmlComponent component(&engine); @@ -150,9 +144,6 @@ void tst_qquickfontloader::failLocalFont() void tst_qquickfontloader::webFont() { -#if defined(Q_OS_WIN) - QSKIP("Windows doesn't support font loading."); -#endif QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"" SERVER_ADDR "/tarzeau_ocr_a.ttf\" }"; QQmlComponent component(&engine); @@ -167,9 +158,6 @@ void tst_qquickfontloader::webFont() void tst_qquickfontloader::redirWebFont() { -#if defined(Q_OS_WIN) - QSKIP("Windows doesn't support font loading."); -#endif server.addRedirect("olddir/oldname.ttf","../tarzeau_ocr_a.ttf"); QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"" SERVER_ADDR "/olddir/oldname.ttf\" }"; @@ -186,9 +174,6 @@ void tst_qquickfontloader::redirWebFont() void tst_qquickfontloader::failWebFont() { -#if defined(Q_OS_WIN) - QSKIP("Windows doesn't support font loading."); -#endif QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"" SERVER_ADDR "/nonexist.ttf\" }"; QTest::ignoreMessage(QtWarningMsg, "file::2:1: QML FontLoader: Cannot load font: \"" SERVER_ADDR "/nonexist.ttf\""); QQmlComponent component(&engine); @@ -203,9 +188,6 @@ void tst_qquickfontloader::failWebFont() void tst_qquickfontloader::changeFont() { -#if defined(Q_OS_WIN) - QSKIP("Windows doesn't support font loading."); -#endif QString componentStr = "import QtQuick 2.0\nFontLoader { source: font }"; QQmlContext *ctxt = engine.rootContext(); ctxt->setContextProperty("font", testFileUrl("tarzeau_ocr_a.ttf")); @@ -245,9 +227,6 @@ void tst_qquickfontloader::changeFont() void tst_qquickfontloader::changeFontSourceViaState() { -#if defined(Q_OS_WIN) - QSKIP("Windows doesn't support font loading."); -#endif QQuickView window(testFileUrl("qtbug-20268.qml")); window.show(); window.requestActivateWindow(); |