From 132b45f67075ef2b15fb9dd1a3e03ea19ffa1061 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Tue, 2 Jan 2024 20:25:54 -0600 Subject: [PATCH] Use qmake-qt5 in autoreload if it exists On Fedora 39, the Qt5 qmake is installed as qmake-qt5. As such, use it when autoreloading instead of qmake if it exists. --- autoreload.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/autoreload.py b/autoreload.py index f3e8116e..8dfc9805 100755 --- a/autoreload.py +++ b/autoreload.py @@ -11,6 +11,7 @@ Use `pip3 install --user -U requirements-dev.txt` before running this.""" import os import subprocess +import shutil import sys from contextlib import suppress from pathlib import Path @@ -49,8 +50,13 @@ def cmd(*parts) -> subprocess.CompletedProcess: def run_app(args=sys.argv[1:]) -> None: print("\n\x1b[36m", "─" * term_size().columns, "\x1b[0m\n", sep="") + if shutil.which("qmake-qt5"): + QMAKE_CMD = "qmake-qt5" + else: + QMAKE_CMD = "qmake" + with suppress(KeyboardInterrupt): - cmd("qmake", "moment.pro", "CONFIG+=dev") + cmd(QMAKE_CMD, "moment.pro", "CONFIG+=dev") cmd("make") cmd("./moment", "-name", "dev", *args)