Skip to content

[Sofa.Gui] Fix macro to enable qt.conf #286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
damienmarchal merged 1 commit into from
Jul 12, 2022
Merged

[Sofa.Gui] Fix macro to enable qt.conf #286

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions bindings/SofaGui/src/SofaPython3/SofaGui/Module_SofaGui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
#include <sofa/helper/system/FileSystem.h>
using sofa::helper::system::FileSystem;

#if SOFAGUI_HAVE_SOFAGUIQT
#if SOFAGUI_HAVE_SOFA_GUI_QT
#include <sofa/gui/qt/qt.conf.h>
#endif // SOFAGUI_HAVE_SOFAGUIQT
#endif // SOFAGUI_HAVE_SOFA_GUI_QT

#include "Binding_BaseGui.h"
#include "Binding_GUIManager.h"
Expand Down Expand Up @@ -63,7 +63,7 @@ PYBIND11_MODULE(Gui, m) {
:members:
)doc";

#if SOFAGUI_HAVE_SOFAGUIQT
#if SOFAGUI_HAVE_SOFA_GUI_QT
std::string sofaPrefixAbsolute = sofa::helper::Utils::getSofaPathPrefix();
std::string inputFilepath = FileSystem::cleanPath(sofaPrefixAbsolute + "/bin/qt.conf");
bool success = sofa::gui::qt::loadQtConfWithCustomPrefix(inputFilepath, sofaPrefixAbsolute);
Expand All @@ -81,7 +81,7 @@ PYBIND11_MODULE(Gui, m) {
}
std::cout << std::endl;
}
#endif // SOFAGUI_HAVE_SOFAGUIQT
#endif // SOFAGUI_HAVE_SOFA_GUI_QT

// This is needed to make sure the GuiMain library (libSofaGuiMain.so) is correctly
// linked since the GUIs are statically created during the load of the library.
Expand Down