From c7bd6182e0527304e9d95e99c99eee3deac68b11 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 8 Jul 2024 15:25:54 +0200 Subject: [PATCH] Do not hard-code qmake command --- kiwixbuild/buildenv.py | 4 +++- kiwixbuild/dependencies/base.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kiwixbuild/buildenv.py b/kiwixbuild/buildenv.py index 0c10157..cdd65b9 100644 --- a/kiwixbuild/buildenv.py +++ b/kiwixbuild/buildenv.py @@ -32,7 +32,9 @@ class NeutralEnv: self.git_command = self._detect_command("git") self.make_command = self._detect_command("make") self.cmake_command = self._detect_command("cmake") - self.qmake_command = self._detect_command("qmake", required=False) + self.qmake_command = self._detect_command( + "qmake", required=False, default=[["qmake"], ["qmake-qt5"]] + ) def detect_platform(self): _platform = platform.system() diff --git a/kiwixbuild/dependencies/base.py b/kiwixbuild/dependencies/base.py index ac3b8e7..9282ef2 100644 --- a/kiwixbuild/dependencies/base.py +++ b/kiwixbuild/dependencies/base.py @@ -502,7 +502,7 @@ class QMakeBuilder(MakeBuilder): def _configure(self, context): context.try_skip(self.build_path) command = [ - "qmake", + *neutralEnv("qmake_command"), *self.configure_options, *self.env_options, self.source_path,