diff options
| author | Morten Johan Sorvig <morten.sorvig@nokia.com> | 2011-12-14 15:11:49 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-22 13:20:40 +0100 |
| commit | 40cfdf30fa6c68da8a5cbd37e21d844239545585 (patch) | |
| tree | 2e204fcdb44b54f33698f39d95ce0ea30d61afea /src/widgets/styles/qmacstyle_mac_p.h | |
| parent | 08845d3531319e4a537f31f7ef13233c8d1222be (diff) | |
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>
Diffstat (limited to 'src/widgets/styles/qmacstyle_mac_p.h')
| -rw-r--r-- | src/widgets/styles/qmacstyle_mac_p.h | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/src/widgets/styles/qmacstyle_mac_p.h b/src/widgets/styles/qmacstyle_mac_p.h index 747779249c..fc10be507f 100644 --- a/src/widgets/styles/qmacstyle_mac_p.h +++ b/src/widgets/styles/qmacstyle_mac_p.h @@ -43,13 +43,13 @@ #ifndef QMACSTYLE_MAC_P_H #define QMACSTYLE_MAC_P_H -#include <qmacstyle_mac.h> +#include <Carbon/Carbon.h> +#undef check + +#include "qmacstyle_mac.h" #include <private/qapplication_p.h> #include <private/qcombobox_p.h> -#include <private/qmacstylepixmaps_mac_p.h> -#include <private/qpaintengine_mac_p.h> #include <private/qpainter_p.h> -#include <private/qprintengine_mac_p.h> #include <private/qstylehelper_p.h> #include <qapplication.h> #include <qbitmap.h> @@ -94,7 +94,8 @@ #include <qmath.h> #include <QtWidgets/qgraphicsproxywidget.h> #include <QtWidgets/qgraphicsview.h> -#include <private/qt_cocoa_helpers_mac_p.h> + + // // W A R N I N G @@ -109,21 +110,6 @@ QT_BEGIN_NAMESPACE -#if (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5) -enum { - kThemePushButtonTextured = 31, - kThemePushButtonTexturedSmall = 32, - kThemePushButtonTexturedMini = 33 -}; - -/* Search fields */ -enum { - kHIThemeFrameTextFieldRound = 1000, - kHIThemeFrameTextFieldRoundSmall = 1001, - kHIThemeFrameTextFieldRoundMini = 1002 -}; -#endif - /* AHIG: Apple Human Interface Guidelines |