From 40cfdf30fa6c68da8a5cbd37e21d844239545585 Mon Sep 17 00:00:00 2001 From: Morten Johan Sorvig Date: Wed, 14 Dec 2011 15:11:49 +0100 Subject: Enable Mac style on Mac OS X. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add styles/qmacstyle_mac back to the build, modify qstylefactory to load it on Q_OS_MAC. Move helper functions from platforms/mac to qmacstyle_mac.mm. QMacStyle should now be self- contained and not rely on anything from platforms/mac. Change-Id: I68fe40bb7f88c01269968bffd9579b7f3b932d4c Reviewed-by: Richard Moe Gustavsen Reviewed-by: Morten Johan Sørvig --- tests/auto/widgets/styles/styles.pro | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests/auto/widgets') diff --git a/tests/auto/widgets/styles/styles.pro b/tests/auto/widgets/styles/styles.pro index 20a59dea45..7e931582db 100644 --- a/tests/auto/widgets/styles/styles.pro +++ b/tests/auto/widgets/styles/styles.pro @@ -1,7 +1,6 @@ TEMPLATE=subdirs SUBDIRS=\ -# disabled in src/widgets/styles/styles.pri, so disable the test as well -# qmacstyle \ + qmacstyle \ qstyle \ qstyleoption \ qstylesheetstyle \ -- cgit v1.2.3