diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-01-16 12:02:14 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-18 12:51:18 +0100 |
commit | 44cf5592acf97ecb2c83e9d7451de08b97498036 (patch) | |
tree | a9127444b50906e10f036edc718bdb8b74feaf80 /tests/auto/gui/text/qfontdatabase | |
parent | 4f25e66f7a7269af0002bfe4b1c5caa941c6ee64 (diff) |
Replace Q_WS_MAC with Q_OS_MAC in tests/auto/gui
Change-Id: I6d69ac96597f27575dd40e4c80c982f06fa88f51
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'tests/auto/gui/text/qfontdatabase')
-rw-r--r-- | tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp index e7bbfbceff..edaaf33a39 100644 --- a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp +++ b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp @@ -63,7 +63,7 @@ private slots: void fixedPitch_data(); void fixedPitch(); -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC void trickyFonts_data(); void trickyFonts(); #endif @@ -132,7 +132,7 @@ void tst_QFontDatabase::fixedPitch_data() QTest::newRow( "Andale Mono" ) << QString( "Andale Mono" ) << true; QTest::newRow( "Courier" ) << QString( "Courier" ) << true; QTest::newRow( "Courier New" ) << QString( "Courier New" ) << true; -#ifndef Q_WS_MAC +#ifndef Q_OS_MAC QTest::newRow( "Script" ) << QString( "Script" ) << false; QTest::newRow( "Lucida Console" ) << QString( "Lucida Console" ) << true; QTest::newRow( "DejaVu Sans" ) << QString( "DejaVu Sans" ) << false; @@ -162,7 +162,7 @@ void tst_QFontDatabase::fixedPitch() QCOMPARE(fi.fixedPitch(), fixedPitch); } -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC void tst_QFontDatabase::trickyFonts_data() { QTest::addColumn<QString>("font"); @@ -247,7 +247,7 @@ void tst_QFontDatabase::addAppFont() #endif QCOMPARE(fontDbChangedSpy.count(), 1); // addApplicationFont is supported on Mac, don't skip the test if it breaks. -#ifndef Q_WS_MAC +#ifndef Q_OS_MAC if (id == -1) QSKIP("Skip the test since app fonts are not supported on this system"); #endif |