Skip to content

Fix findQmlImportScanner() on FreeBSD #217

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

Open
arrowd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix findQmlImportScanner() on FreeBSD #217

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
19 changes: 18 additions & 1 deletion src/qml.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
// system headers
#include <filesystem>

#ifdef __FreeBSD__
#include <sys/sysctl.h>
#endif

// library includes
#include <nlohmann/json.hpp>
#include <linuxdeploy/core/appdir.h>
Expand All @@ -22,7 +26,20 @@ using namespace nlohmann;
namespace fs = std::filesystem;

fs::path findQmlImportScanner() {
return which("qmlimportscanner");
auto path = which("qmlimportscanner");
#ifdef __FreeBSD__
int mib[2];
char buf[PATH_MAX];
size_t len = PATH_MAX;

mib[0] = CTL_USER;
mib[1] = USER_LOCALBASE;
if (::sysctl(mib, 2, buf, &len, NULL, 0) != 0)
return path;

path = which(std::string(buf) + "/libexec/qt6/qmlimportscanner");
#endif
return path;
}

std::string runQmlImportScanner(const std::vector<std::filesystem::path> &sourcesPaths, const std::vector<fs::path> &qmlImportPaths) {
Expand Down