diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-24 11:26:22 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-24 11:48:46 +0200 |
| commit | 1a9759855639b9e2b3cdc0687d3381dcbf6c9815 (patch) | |
| tree | b2da51f6eddddb83c2d97cdcfac24d38d2e67a4e /tests/auto/qmltest/fontloader/tst_fontloader.qml | |
| parent | 8217ec1b888f3ff93f004801b018c5f85362c484 (diff) | |
| parent | e1fc2793aef53b84a3f1e19b6d6bdf1141340074 (diff) | |
Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into wip/v4
Conflicts:
src/imports/qtquick2/plugins.qmltypes
src/qml/debugger/qv8debugservice.cpp
src/qml/qml/qml.pri
src/qml/qml/qqmlcompiler.cpp
src/qml/qml/qqmlcomponent.cpp
src/qml/qml/qqmlcontext.cpp
src/qml/qml/qqmldata_p.h
src/qml/qml/qqmlengine_p.h
src/qml/qml/qqmljavascriptexpression.cpp
src/qml/qml/qqmlxmlhttprequest.cpp
src/qml/qml/v4/qv4bindings.cpp
src/qml/qml/v4/qv4irbuilder.cpp
src/qml/qml/v4/qv4jsonobject_p.h
src/qml/qml/v8/qqmlbuiltinfunctions.cpp
src/qml/qml/v8/qv8bindings.cpp
src/qml/qml/v8/qv8contextwrapper.cpp
src/qml/qml/v8/qv8listwrapper.cpp
src/qml/qml/v8/qv8qobjectwrapper.cpp
src/qml/qml/v8/qv8qobjectwrapper_p.h
src/qml/qml/v8/qv8sequencewrapper_p_p.h
src/qml/qml/v8/qv8typewrapper.cpp
src/qml/qml/v8/qv8valuetypewrapper.cpp
src/qml/types/qqmldelegatemodel.cpp
src/quick/items/context2d/qquickcanvasitem.cpp
src/quick/items/context2d/qquickcontext2d.cpp
sync.profile
tests/auto/qml/qjsengine/tst_qjsengine.cpp
tests/benchmarks/qml/animation/animation.pro
tools/qmlprofiler/qmlprofiler.pro
Change-Id: I18a76b8a81d87523247fa03a44ca334b1a2360c9
Diffstat (limited to 'tests/auto/qmltest/fontloader/tst_fontloader.qml')
| -rw-r--r-- | tests/auto/qmltest/fontloader/tst_fontloader.qml | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/tests/auto/qmltest/fontloader/tst_fontloader.qml b/tests/auto/qmltest/fontloader/tst_fontloader.qml index 4d79a170f3..33307a3702 100644 --- a/tests/auto/qmltest/fontloader/tst_fontloader.qml +++ b/tests/auto/qmltest/fontloader/tst_fontloader.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 Item { @@ -63,34 +63,37 @@ Item { name: "FontLoader" function test_fontloading() { + if (Qt.platform.os === "mac") + skip("Skipped for QTBUG-25306") + compare(fontloader.status, FontLoader.Null) compare(testinput.font.family, "") fontloader.source = "tarzeau_ocr_a.ttf"; - tryCompare(fontloader.status, FontLoader.Loading) - tryCompare(fontloader.status, FontLoader.Ready) + tryCompare(fontloader, 'status', FontLoader.Ready) compare(testinput.font.family, "OCRA") fontloader.source = "dummy.ttf"; - tryCompare(fontloader.status, FontLoader.Error) + tryCompare(fontloader, 'status', FontLoader.Error) compare(testinput.font.family, "") fontloader.source = ""; fontloader.name = "Courier"; - tryCompare(fontloader.status, FontLoader.Ready) + tryCompare(fontloader, 'status', FontLoader.Ready) compare(testinput.font.family, "Courier") } function test_fontswitching() { + if (Qt.platform.os === "mac") + skip("Skipped for QTBUG-25306") + compare(fontswitch.status, FontLoader.Null) fontswitch.source = "tarzeau_ocr_a.ttf"; - tryCompare(fontswitch.status, FontLoader.Loading) - tryCompare(fontswitch.status, FontLoader.Ready) - tryCompare(fontswitch.name, "OCRA") + tryCompare(fontswitch, 'status', FontLoader.Ready) + compare(fontswitch.name, "OCRA") fontswitch.source = ""; fontswitch.name = "Courier"; - tryCompare(fontswitch.status, FontLoader.Ready) - tryCompare(fontswitch.name, "Courier") + tryCompare(fontswitch, 'status', FontLoader.Ready) + compare(fontswitch.name, "Courier") fontswitch.source = "tarzeau_ocr_a.ttf"; - tryCompare(fontswitch.status, FontLoader.Loading) - tryCompare(fontswitch.status, FontLoader.Ready) + tryCompare(fontswitch, 'status', FontLoader.Ready) compare(fontswitch.name, "OCRA") } } |