Use scalable application icon resources on macOS

Fixes #2920
2017-02-22 19:04:22 -08:00 · 2017-02-22 19:04:22 -08:00 · 28f7944027
commit 28f7944027
parent 402aef2e63
1 changed files with 2 additions and 0 deletions
--- a/src/Gui/Application.cpp
+++ b/src/Gui/Application.cpp
@ -1526,7 +1526,9 @@ void Application::runApplication(void)
    else {
        mainApp.setApplicationName(QString::fromUtf8(App::GetApplication().getExecutableName()));
    }
+#ifndef Q_OS_MACX
    mainApp.setWindowIcon(Gui::BitmapFactory().pixmap(App::Application::Config()["AppIcon"].c_str()));
+#endif
    QString plugin;
    plugin = QString::fromUtf8(App::GetApplication().getHomePath());
    plugin += QLatin1String("/plugins");