diff options
| author | Liang Qi <liang.qi@digia.com> | 2013-05-21 10:19:37 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-22 12:39:38 +0200 |
| commit | 8f429765966be3040c1ae872c8d28e938956e251 (patch) | |
| tree | 4727ba290284aca24b4a86266a4aadd3330f8ca4 /tests/auto/qmltest | |
| parent | 8c60f86bdfb1bdeb1e0dab9c81cd53e46e4af221 (diff) | |
Re-enable qmltest on Mac
Only tst_fontloader.qml fails on Mac, and we have useful Qt.platform.os.
Task-number: QTBUG-25306
Change-Id: I6f4082028a188453378ad7ef73f51b1df2d89f11
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Diffstat (limited to 'tests/auto/qmltest')
| -rw-r--r-- | tests/auto/qmltest/fontloader/tst_fontloader.qml | 8 | ||||
| -rw-r--r-- | tests/auto/qmltest/qmltest.pro | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tests/auto/qmltest/fontloader/tst_fontloader.qml b/tests/auto/qmltest/fontloader/tst_fontloader.qml index 001442e541..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,6 +63,9 @@ 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"; @@ -78,6 +81,9 @@ Item { } 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.Ready) diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro index 0a7967654c..b1c29226e6 100644 --- a/tests/auto/qmltest/qmltest.pro +++ b/tests/auto/qmltest/qmltest.pro @@ -9,5 +9,4 @@ importFiles.files = borderimage buttonclick createbenchmark events qqmlbindi importFiles.path = . DEPLOYMENT += importFiles -mac:CONFIG+=insignificant_test # QTBUG-25306 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |