mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-02-08 05:50:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Bug fixes

Browse Source 
-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:
Person 2017-03-12 18:34:45 -07:00
parent 188a5216d5
commit 7862cf4c40
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Builds/QtCreator/defaults.pri
View File

@ -51,7 +51,13 @@ win32 {
INCLUDEPATH += /usr/local/include/GL INCLUDEPATH += /usr/local/include/GL
INCLUDEPATH += /usr/include/glm INCLUDEPATH += /usr/include/glm
INCLUDEPATH += /usr/include/tbb INCLUDEPATH += /usr/include/tbb
unix:!macx {
INCLUDEPATH += /usr/include/libxml2 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. #libjpeg and libpng aren't in separate folders, so nothing to add here for them.
} }
@ -83,8 +89,14 @@ else {
LIBS += -lpng LIBS += -lpng
LIBS += -ltbb LIBS += -ltbb
LIBS += -lpthread LIBS += -lpthread
unix:!macx {
LIBS += -lxml2 LIBS += -lxml2
} }
else {
LIBS += -L/usr/local/opt/libxml2/lib -lxml2
}
}
macx { macx {
LIBS += -framework OpenGL LIBS += -framework OpenGL

4
Source/Fractorium/Fractorium.cpp
View File

@ -45,6 +45,10 @@ Fractorium::Fractorium(QWidget* p)
m_VarSortMode = 1;//Sort by weight by default. m_VarSortMode = 1;//Sort by weight by default.
m_PaletteSortMode = 0;//Sort by palette ascending by default. m_PaletteSortMode = 0;//Sort by palette ascending by default.
m_ColorDialog = new QColorDialog(this); 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_Settings = FractoriumSettings::Instance();
m_QssDialog = new QssDialog(this); m_QssDialog = new QssDialog(this);
m_FileDialog = nullptr;//Use lazy instantiation upon first use. m_FileDialog = nullptr;//Use lazy instantiation upon first use.