mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-21 05:00:06 -05:00
--Bug fixes
-Set path to libxml2 properly on Mac in defaults.pri -Workaround for color picker dialog crashing on program exit on Mac
This commit is contained in:
parent
188a5216d5
commit
7862cf4c40
@ -51,7 +51,13 @@ win32 {
|
||||
INCLUDEPATH += /usr/local/include/GL
|
||||
INCLUDEPATH += /usr/include/glm
|
||||
INCLUDEPATH += /usr/include/tbb
|
||||
INCLUDEPATH += /usr/include/libxml2
|
||||
|
||||
unix:!macx {
|
||||
INCLUDEPATH += /usr/include/libxml2
|
||||
}
|
||||
else {
|
||||
INCLUDEPATH += /usr/local/opt/libxml2/include/libxml2
|
||||
}
|
||||
|
||||
#libjpeg and libpng aren't in separate folders, so nothing to add here for them.
|
||||
}
|
||||
@ -83,7 +89,13 @@ else {
|
||||
LIBS += -lpng
|
||||
LIBS += -ltbb
|
||||
LIBS += -lpthread
|
||||
LIBS += -lxml2
|
||||
|
||||
unix:!macx {
|
||||
LIBS += -lxml2
|
||||
}
|
||||
else {
|
||||
LIBS += -L/usr/local/opt/libxml2/lib -lxml2
|
||||
}
|
||||
}
|
||||
|
||||
macx {
|
||||
|
@ -45,6 +45,10 @@ Fractorium::Fractorium(QWidget* p)
|
||||
m_VarSortMode = 1;//Sort by weight by default.
|
||||
m_PaletteSortMode = 0;//Sort by palette ascending by default.
|
||||
m_ColorDialog = new QColorDialog(this);
|
||||
#ifdef __APPLE__
|
||||
//Fixes crashing problem when closing Fractorium in Mac OS 10.12 Sierra.
|
||||
m_ColorDialog->setOption(QColorDialog::NoButtons);
|
||||
#endif
|
||||
m_Settings = FractoriumSettings::Instance();
|
||||
m_QssDialog = new QssDialog(this);
|
||||
m_FileDialog = nullptr;//Use lazy instantiation upon first use.
|
||||
|
Loading…
Reference in New Issue
Block a user