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/styles.pri | |
| 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/styles.pri')
| -rw-r--r-- | src/widgets/styles/styles.pri | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/widgets/styles/styles.pri b/src/widgets/styles/styles.pri index cf7ee5a0a4..ef6827f74f 100644 --- a/src/widgets/styles/styles.pri +++ b/src/widgets/styles/styles.pri @@ -37,8 +37,7 @@ contains( styles, all ) { styles = mac windows windowsxp windowsvista } -# TODO, re-enable qmacstyle in tests/auto/widgets/styles/sytles.pro when done -styles -= mac +!macx-*:styles -= mac x11{ QMAKE_CXXFLAGS += $$QT_CFLAGS_QGTKSTYLE |