Commit 8f429765 authored by Liang Qi's avatar Liang Qi Committed by The Qt Project
Browse files

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: default avatarGabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: default avatarSergio Ahumada <sergio.ahumada@digia.com>
parent 8c60f86b
No related merge requests found
Showing with 7 additions and 2 deletions
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
** **
****************************************************************************/ ****************************************************************************/
import QtQuick 2.0 import QtQuick 2.1
import QtTest 1.0 import QtTest 1.0
Item { Item {
...@@ -63,6 +63,9 @@ Item { ...@@ -63,6 +63,9 @@ Item {
name: "FontLoader" name: "FontLoader"
function test_fontloading() { function test_fontloading() {
if (Qt.platform.os === "mac")
skip("Skipped for QTBUG-25306")
compare(fontloader.status, FontLoader.Null) compare(fontloader.status, FontLoader.Null)
compare(testinput.font.family, "") compare(testinput.font.family, "")
fontloader.source = "tarzeau_ocr_a.ttf"; fontloader.source = "tarzeau_ocr_a.ttf";
...@@ -78,6 +81,9 @@ Item { ...@@ -78,6 +81,9 @@ Item {
} }
function test_fontswitching() { function test_fontswitching() {
if (Qt.platform.os === "mac")
skip("Skipped for QTBUG-25306")
compare(fontswitch.status, FontLoader.Null) compare(fontswitch.status, FontLoader.Null)
fontswitch.source = "tarzeau_ocr_a.ttf"; fontswitch.source = "tarzeau_ocr_a.ttf";
tryCompare(fontswitch, 'status', FontLoader.Ready) tryCompare(fontswitch, 'status', FontLoader.Ready)
......
...@@ -9,5 +9,4 @@ importFiles.files = borderimage buttonclick createbenchmark events qqmlbindi ...@@ -9,5 +9,4 @@ importFiles.files = borderimage buttonclick createbenchmark events qqmlbindi
importFiles.path = . importFiles.path = .
DEPLOYMENT += importFiles DEPLOYMENT += importFiles
mac:CONFIG+=insignificant_test # QTBUG-25306
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment