diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-12 12:28:12 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-12 12:28:13 +0200 |
| commit | de6851aca7b1d3d08a1b5759fc28f61af5d53243 (patch) | |
| tree | 87e29c988ff35f28d8dc2838aa0636b54188674a /tests | |
| parent | e14df5bb36fa16bf1f13c0b24a12dc558c5a089b (diff) | |
| parent | 602bec12868365323777298989ef4a1bf559cfac (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ibb584a2d7975996cd26514b82d1da2d447fcbebf
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"; |