Fix Mac OS X crash issue, License file updated

This commit is contained in:
Syping 2017-02-21 22:57:30 +01:00
parent 2efd83af9f
commit 4fc5959f71
3 changed files with 66 additions and 8 deletions

View file

@ -30,6 +30,7 @@
#include "IconLoader.h"
#include "AppEnv.h"
#include "config.h"
#include <QtGlobal>
#include <QStyleFactory>
#include <QFileDialog>
#include <QHBoxLayout>
@ -65,6 +66,18 @@ UserInterface::UserInterface(ProfileDatabase *profileDB, CrewDatabase *crewDB, D
{
ui->cmdClose->setIcon(QIcon::fromTheme("dialog-close"));
}
if (QIcon::hasThemeIcon("preferences-system"))
{
#ifndef Q_WS_MAC // Setting icon for preferences/settings/options lead to a crash in Mac OS X
ui->actionOptions->setIcon(QIcon::fromTheme("preferences-system"));
#endif
}
if (QIcon::hasThemeIcon("application-exit"))
{
#ifndef Q_WS_MAC // Setting icon for exit/quit lead to a crash in Mac OS X
ui->actionExit->setIcon(QIcon::fromTheme("application-exit"));
#endif
}
}
void UserInterface::setupDirEnv()