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>

diff --git a/tests/auto/qmltest/fontloader/tst_fontloader.qml b/tests/auto/qmltest/fontloader/tst_fontloader.qml
index 001442e..33307a3 100644 (file)
--- 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 0a79676..b1c2922 100644 (file)
--- 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