Merge pull request #8825 from nirvn/osx

[themes] Force fusion style for non-default UI themes on OS X
qgis · Jan 10, 2019 · abb0f73 · abb0f73
2 parents c263750 + c7abba0
commit abb0f73
Showing 1 changed file with 0 additions and 2 deletions.
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 ) ) )