d28073d9 enables the Mac style on all "mac" platforms,
including iOS where it does not compile.

Disable the mac style on all platforms except
"macx" (Mac OS X).

Change-Id: I67685f745b1a0910b05794cddeaf27cdaa31cbfd
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
This commit is contained in:
Morten Johan Sørvig 2013-03-06 10:34:22 +01:00 committed by The Qt Project
parent a8021ed985
commit 6c55e55307

View File

@ -40,7 +40,7 @@ contains( styles, all ) {
styles = fusion mac windows windowsxp windowsvista styles = fusion mac windows windowsxp windowsvista
} }
!mac:styles -= mac !macx:styles -= mac
contains(QT_CONFIG, gtkstyle) { contains(QT_CONFIG, gtkstyle) {
QMAKE_CXXFLAGS += $$QT_CFLAGS_QGTKSTYLE QMAKE_CXXFLAGS += $$QT_CFLAGS_QGTKSTYLE