Merge pull request #710 from kiwix/no_qmake5_hardcoded

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()

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,