Enable Mac style on Mac OS X.
authorMorten Johan Sorvig <morten.sorvig@nokia.com>
Wed, 14 Dec 2011 14:11:49 +0000 (15:11 +0100)
committerQt by Nokia <qt-info@nokia.com>
Thu, 22 Dec 2011 12:20:40 +0000 (13:20 +0100)
commit40cfdf30fa6c68da8a5cbd37e21d844239545585
tree2e204fcdb44b54f33698f39d95ce0ea30d61afea
parent08845d3531319e4a537f31f7ef13233c8d1222be
Enable Mac style on Mac OS X.

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 <richard.gustavsen@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
14 files changed:
src/widgets/kernel/qguiplatformplugin.cpp
src/widgets/kernel/qwidget.h
src/widgets/platforms/mac/qpaintdevice_mac.cpp
src/widgets/platforms/mac/qpaintengine_mac.cpp
src/widgets/platforms/mac/qregion_mac.cpp
src/widgets/platforms/mac/qt_cocoa_helpers_mac.mm
src/widgets/platforms/mac/qt_cocoa_helpers_mac_p.h
src/widgets/platforms/mac/qt_mac.cpp
src/widgets/styles/qmacstyle_mac.h
src/widgets/styles/qmacstyle_mac.mm
src/widgets/styles/qmacstyle_mac_p.h
src/widgets/styles/qstylefactory.cpp
src/widgets/styles/styles.pri
tests/auto/widgets/styles/styles.pro