Commit b630cfba authored by J-P Nurmi's avatar J-P Nurmi Committed by Qt by Nokia
Browse files

tst_qquickfontloader: remove unnecessary skips on Windows


Change-Id: I319d0a5cc2387c5bc1b308e6e12a33e720a2d722
Reviewed-by: default avatarSergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: default avatarCaroline Chao <caroline.chao@nokia.com>
parent 7cab011a
No related merge requests found
Showing with 0 additions and 21 deletions
...@@ -117,9 +117,6 @@ void tst_qquickfontloader::namedFont() ...@@ -117,9 +117,6 @@ void tst_qquickfontloader::namedFont()
void tst_qquickfontloader::localFont() 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() + "\" }"; QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"" + testFileUrl("tarzeau_ocr_a.ttf").toString() + "\" }";
QQmlComponent component(&engine); QQmlComponent component(&engine);
component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
...@@ -133,9 +130,6 @@ void tst_qquickfontloader::localFont() ...@@ -133,9 +130,6 @@ void tst_qquickfontloader::localFont()
void tst_qquickfontloader::failLocalFont() 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() + "\" }"; 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()); QTest::ignoreMessage(QtWarningMsg, QString("file::2:1: QML FontLoader: Cannot load font: \"" + testFileUrl("dummy.ttf").toString() + "\"").toUtf8().constData());
QQmlComponent component(&engine); QQmlComponent component(&engine);
...@@ -150,9 +144,6 @@ void tst_qquickfontloader::failLocalFont() ...@@ -150,9 +144,6 @@ void tst_qquickfontloader::failLocalFont()
void tst_qquickfontloader::webFont() 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\" }"; QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"" SERVER_ADDR "/tarzeau_ocr_a.ttf\" }";
QQmlComponent component(&engine); QQmlComponent component(&engine);
...@@ -167,9 +158,6 @@ void tst_qquickfontloader::webFont() ...@@ -167,9 +158,6 @@ void tst_qquickfontloader::webFont()
void tst_qquickfontloader::redirWebFont() 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"); server.addRedirect("olddir/oldname.ttf","../tarzeau_ocr_a.ttf");
QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"" SERVER_ADDR "/olddir/oldname.ttf\" }"; QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"" SERVER_ADDR "/olddir/oldname.ttf\" }";
...@@ -186,9 +174,6 @@ void tst_qquickfontloader::redirWebFont() ...@@ -186,9 +174,6 @@ void tst_qquickfontloader::redirWebFont()
void tst_qquickfontloader::failWebFont() 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\" }"; 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\""); QTest::ignoreMessage(QtWarningMsg, "file::2:1: QML FontLoader: Cannot load font: \"" SERVER_ADDR "/nonexist.ttf\"");
QQmlComponent component(&engine); QQmlComponent component(&engine);
...@@ -203,9 +188,6 @@ void tst_qquickfontloader::failWebFont() ...@@ -203,9 +188,6 @@ void tst_qquickfontloader::failWebFont()
void tst_qquickfontloader::changeFont() 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 }"; QString componentStr = "import QtQuick 2.0\nFontLoader { source: font }";
QQmlContext *ctxt = engine.rootContext(); QQmlContext *ctxt = engine.rootContext();
ctxt->setContextProperty("font", testFileUrl("tarzeau_ocr_a.ttf")); ctxt->setContextProperty("font", testFileUrl("tarzeau_ocr_a.ttf"));
...@@ -245,9 +227,6 @@ void tst_qquickfontloader::changeFont() ...@@ -245,9 +227,6 @@ void tst_qquickfontloader::changeFont()
void tst_qquickfontloader::changeFontSourceViaState() void tst_qquickfontloader::changeFontSourceViaState()
{ {
#if defined(Q_OS_WIN)
QSKIP("Windows doesn't support font loading.");
#endif
QQuickView window(testFileUrl("qtbug-20268.qml")); QQuickView window(testFileUrl("qtbug-20268.qml"));
window.show(); window.show();
window.requestActivateWindow(); window.requestActivateWindow();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment