From 945e3212cf6b6742bdc0c34a12b78f3318e9ff5f Mon Sep 17 00:00:00 2001
From: Nathan Coad <nathan@thecoads.com>
Date: Sat, 31 Jan 2026 21:20:43 +1100
Subject: [PATCH] fix qmake

---
 .drone.yml                         | 18 +++++++++---------
 mkspecs/linux-arm64-g++/qmake.conf | 10 +++++++++-
 mkspecs/linux-armhf-g++/qmake.conf | 10 +++++++++-
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index c2b760c..8f47c47 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,15 +3,15 @@ type: docker
 name: build
 
 steps:
-- name: build-deb-amd64
-  image: cache.coadcorp.com/library/buildpack-deps:jammy
-  environment:
-    DEBIAN_FRONTEND: noninteractive
-  commands:
-  - apt-get update
-  - apt-get install -y --no-install-recommends build-essential qt5-qmake qtbase5-dev qtbase5-dev-tools libexif-dev qt5-image-formats-plugins libmosquitto-dev dpkg-dev fakeroot ca-certificates
-  - ARCH=amd64 BUILD_DIR=build-amd64 bash sbin/build_deb.sh "${DRONE_TAG:-${DRONE_COMMIT_SHA:0:8}}"
-  - ls -la dist
+# - name: build-deb-amd64
+#   image: cache.coadcorp.com/library/buildpack-deps:jammy
+#   environment:
+#     DEBIAN_FRONTEND: noninteractive
+#   commands:
+#   - apt-get update
+#   - apt-get install -y --no-install-recommends build-essential qt5-qmake qtbase5-dev qtbase5-dev-tools libexif-dev qt5-image-formats-plugins libmosquitto-dev dpkg-dev fakeroot ca-certificates
+#   - ARCH=amd64 BUILD_DIR=build-amd64 bash sbin/build_deb.sh "${DRONE_TAG:-${DRONE_COMMIT_SHA:0:8}}"
+#   - ls -la dist
 
 - name: build-deb-armhf
   image: cache.coadcorp.com/library/buildpack-deps:jammy
diff --git a/mkspecs/linux-arm64-g++/qmake.conf b/mkspecs/linux-arm64-g++/qmake.conf
index ee4a315..b768f77 100644
--- a/mkspecs/linux-arm64-g++/qmake.conf
+++ b/mkspecs/linux-arm64-g++/qmake.conf
@@ -1,4 +1,12 @@
-include($$[QT_INSTALL_DATA]/mkspecs/linux-g++/qmake.conf)
+exists(/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf) {
+  include(/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf)
+} else: exists(/usr/share/qt5/mkspecs/linux-g++/qmake.conf) {
+  include(/usr/share/qt5/mkspecs/linux-g++/qmake.conf)
+} else: exists($$[QT_HOST_DATA]/mkspecs/linux-g++/qmake.conf) {
+  include($$[QT_HOST_DATA]/mkspecs/linux-g++/qmake.conf)
+} else {
+  include($$[QT_INSTALL_DATA]/mkspecs/linux-g++/qmake.conf)
+}
 
 QMAKE_CC = aarch64-linux-gnu-gcc
 QMAKE_CXX = aarch64-linux-gnu-g++
diff --git a/mkspecs/linux-armhf-g++/qmake.conf b/mkspecs/linux-armhf-g++/qmake.conf
index 5def136..7629019 100644
--- a/mkspecs/linux-armhf-g++/qmake.conf
+++ b/mkspecs/linux-armhf-g++/qmake.conf
@@ -1,4 +1,12 @@
-include($$[QT_INSTALL_DATA]/mkspecs/linux-g++/qmake.conf)
+exists(/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf) {
+  include(/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf)
+} else: exists(/usr/share/qt5/mkspecs/linux-g++/qmake.conf) {
+  include(/usr/share/qt5/mkspecs/linux-g++/qmake.conf)
+} else: exists($$[QT_HOST_DATA]/mkspecs/linux-g++/qmake.conf) {
+  include($$[QT_HOST_DATA]/mkspecs/linux-g++/qmake.conf)
+} else {
+  include($$[QT_INSTALL_DATA]/mkspecs/linux-g++/qmake.conf)
+}
 
 QMAKE_CC = arm-linux-gnueabihf-gcc
 QMAKE_CXX = arm-linux-gnueabihf-g++