diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-12 12:51:49 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-12 13:29:27 +0200 |
| commit | 1f4427dae80712d07a25f8f2d49c187adcbecc6c (patch) | |
| tree | 2bc43475117bf9865f86ae00b2b080f2b17d1222 /tests | |
| parent | 2f9746fbc4ef5439e4c9709353aaf8fe71cff771 (diff) | |
| parent | de6851aca7b1d3d08a1b5759fc28f61af5d53243 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qmltest/fontloader/tst_fontloader.qml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qmltest/fontloader/tst_fontloader.qml b/tests/auto/qmltest/fontloader/tst_fontloader.qml index 33307a3702..59aa72a8eb 100644 --- a/tests/auto/qmltest/fontloader/tst_fontloader.qml +++ b/tests/auto/qmltest/fontloader/tst_fontloader.qml @@ -63,8 +63,8 @@ Item { name: "FontLoader" function test_fontloading() { - if (Qt.platform.os === "mac") - skip("Skipped for QTBUG-25306") + if (Qt.platform.os === "osx") + skip("See QTBUG-32650") compare(fontloader.status, FontLoader.Null) compare(testinput.font.family, "") @@ -81,8 +81,8 @@ Item { } function test_fontswitching() { - if (Qt.platform.os === "mac") - skip("Skipped for QTBUG-25306") + if (Qt.platform.os === "osx") + skip("See QTBUG-32650") compare(fontswitch.status, FontLoader.Null) fontswitch.source = "tarzeau_ocr_a.ttf"; |