[themes] Force fusion style for non-default UI themes on OS X

nirvn · nirvn · commit c7abba03fbea · 2019-01-10T15:09:02.000+07:00
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -1223,7 +1223,6 @@ int main( int argc, char *argv[] )
   // Set the application style.  If it's not set QT will use the platform style except on Windows
   // as it looks really ugly so we use QPlastiqueStyle.
   QString desiredStyle = settings.value( QStringLiteral( "qgis/style" ) ).toString();
-#ifndef Q_OS_MACX
   const QString theme = settings.value( QStringLiteral( "UI/UITheme" ) ).toString();
   if ( theme != QLatin1String( "default" ) )
   {
@@ -1232,7 +1231,6 @@ int main( int argc, char *argv[] )
       desiredStyle = QStringLiteral( "fusion" );
     }
   }
-#endif
   const QString activeStyleName = QApplication::style()->metaObject()->className();
   if ( desiredStyle.contains( QLatin1String( "adwaita" ), Qt::CaseInsensitive )
        || ( desiredStyle.isEmpty() && activeStyleName.contains( QLatin1String( "adwaita" ), Qt::CaseInsensitive ) ) )

Original file line number	Diff line number	Diff line change
`@@ -1223,7 +1223,6 @@ int main( int argc, char *argv[] )`
`1223`	`1223`	`// Set the application style. If it's not set QT will use the platform style except on Windows`
`1224`	`1224`	`// as it looks really ugly so we use QPlastiqueStyle.`
`1225`	`1225`	`QString desiredStyle = settings.value( QStringLiteral( "qgis/style" ) ).toString();`
`1226`		`-#ifndef Q_OS_MACX`
`1227`	`1226`	`const QString theme = settings.value( QStringLiteral( "UI/UITheme" ) ).toString();`
`1228`	`1227`	`if ( theme != QLatin1String( "default" ) )`
`1229`	`1228`	`{`
`@@ -1232,7 +1231,6 @@ int main( int argc, char *argv[] )`
`1232`	`1231`	`desiredStyle = QStringLiteral( "fusion" );`
`1233`	`1232`	`}`
`1234`	`1233`	`}`
`1235`		`-#endif`
`1236`	`1234`	`const QString activeStyleName = QApplication::style()->metaObject()->className();`
`1237`	`1235`	`if ( desiredStyle.contains( QLatin1String( "adwaita" ), Qt::CaseInsensitive )`
`1238`	`1236`	`\|\| ( desiredStyle.isEmpty() && activeStyleName.contains( QLatin1String( "adwaita" ), Qt::CaseInsensitive ) ) )`