diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-01-09 12:04:04 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-09 05:48:39 +0100 |
| commit | fd3052224731f21ad47cc30894559d5933086131 (patch) | |
| tree | 408acafa6a1117e171d4067da194dbc97c933b97 /tests | |
| parent | 34ef939b25666de83d859a0eb814d8ebe94d04e2 (diff) | |
Remove QSKIPs from font loader autotest.
The fix for QTBUG-23484 also fixed this issue.
Task-number: QTBUG-23477
Change-Id: Ie25339e17a079d7e67a92ad8db76f0305399277e
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qtquick2/qdeclarativefontloader/tst_qdeclarativefontloader.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/tests/auto/qtquick2/qdeclarativefontloader/tst_qdeclarativefontloader.cpp b/tests/auto/qtquick2/qdeclarativefontloader/tst_qdeclarativefontloader.cpp index 5b1cbf9fcb..39e9fa3389 100644 --- a/tests/auto/qtquick2/qdeclarativefontloader/tst_qdeclarativefontloader.cpp +++ b/tests/auto/qtquick2/qdeclarativefontloader/tst_qdeclarativefontloader.cpp @@ -143,10 +143,6 @@ void tst_qdeclarativefontloader::failLocalFont() void tst_qdeclarativefontloader::webFont() { -#ifdef Q_OS_MAC - QSKIP("QTBUG-23477"); -#endif - QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"http://localhost:14448/tarzeau_ocr_a.ttf\" }"; QDeclarativeComponent component(&engine); @@ -161,10 +157,6 @@ void tst_qdeclarativefontloader::webFont() void tst_qdeclarativefontloader::redirWebFont() { -#ifdef Q_OS_MAC - QSKIP("QTBUG-23477"); -#endif - server.addRedirect("olddir/oldname.ttf","../tarzeau_ocr_a.ttf"); QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"http://localhost:14448/olddir/oldname.ttf\" }"; @@ -181,10 +173,6 @@ void tst_qdeclarativefontloader::redirWebFont() void tst_qdeclarativefontloader::failWebFont() { -#ifdef Q_OS_MAC - QSKIP("QTBUG-23477"); -#endif - QString componentStr = "import QtQuick 2.0\nFontLoader { source: \"http://localhost:14448/nonexist.ttf\" }"; QTest::ignoreMessage(QtWarningMsg, "file::2:1: QML FontLoader: Cannot load font: \"http://localhost:14448/nonexist.ttf\""); QDeclarativeComponent component(&engine); @@ -199,10 +187,6 @@ void tst_qdeclarativefontloader::failWebFont() void tst_qdeclarativefontloader::changeFont() { -#ifdef Q_OS_MAC - QSKIP("QTBUG-23477"); -#endif - QString componentStr = "import QtQuick 2.0\nFontLoader { source: font }"; QDeclarativeContext *ctxt = engine.rootContext(); ctxt->setContextProperty("font", testFileUrl("tarzeau_ocr_a.ttf")); |