2 files changed, 6 insertions, 11 deletions
diff --git a/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
index c0b857d540..bd14a76bbb 100644
--- a/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
+++ b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
@@ -43,8 +43,6 @@
 #include <QtTest/QtTest>
 #include <QtWidgets>
 
-#include <qmacstyle_mac.h>
-
 const int N = 1;
 
 enum Size { Normal, Small, Mini };
@@ -322,13 +320,13 @@ void tst_QMacStyle::setSize(QWidget *widget, Size size)
 {
     switch (size) {
     case Normal:
-        QMacStyle::setWidgetSizePolicy(widget, QMacStyle::SizeDefault);
+        widget->setAttribute(Qt::WA_MacNormalSize, true);
         break;
     case Small:
-        QMacStyle::setWidgetSizePolicy(widget, QMacStyle::SizeSmall);
+        widget->setAttribute(Qt::WA_MacSmallSize, true);
         break;
     case Mini:
-        QMacStyle::setWidgetSizePolicy(widget, QMacStyle::SizeMini);
+        widget->setAttribute(Qt::WA_MacMiniSize, true);
     }
 }
 
diff --git a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
index f5358b4e15..7cbd30ebb3 100644
--- a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
+++ b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
@@ -71,10 +71,6 @@
 #include <qmdiarea.h>
 #include <qscrollarea.h>
 
-#ifdef Q_OS_MAC
-#include <QMacStyle>
-#endif
-
 #ifdef Q_OS_WINCE_WM
 #include <windows.h>
 
@@ -527,8 +523,9 @@ qDebug("TEST PAINTING");
 #ifdef Q_OS_MAC
 void tst_QStyle::testMacStyle()
 {
-    QMacStyle mstyle;
-    QVERIFY(testAllFunctions(&mstyle));
+    QStyle *mstyle = QStyleFactory::create("Macintosh");
+    QVERIFY(testAllFunctions(mstyle));
+    delete mstyle;
 }
 #endif