From a660290392c1d337422da8bd56165b079cd831e2 Mon Sep 17 00:00:00 2001
From: Tony Mountifield <tony@mountifield.org>
Date: Sun, 16 Aug 2026 22:51:32 +0100
Subject: [PATCH 1/3] Put UI header files in their own directory

---
 .gitignore  | 1 +
 Jamulus.pro | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3b23a7cd6d..1b1b93ad19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ Makefile.*
 *.user.*
 *.o
 moc_*.cpp
+ui/
 ui_*.h
 moc_predefs.h
 .qm/
diff --git a/Jamulus.pro b/Jamulus.pro
index 1465acab81..8a02c16594 100644
--- a/Jamulus.pro
+++ b/Jamulus.pro
@@ -380,6 +380,8 @@ win32 {
 # It doesn't work with multiple targets or architectures.
 RESOURCES += src/resources.qrc
 
+UI_DIR += ui
+
 FORMS_GUI = src/aboutdlgbase.ui \
     src/serverdlgbase.ui
 
@@ -1213,9 +1215,9 @@ android {
     for (abi, ANDROID_ABIS) {
         DISTCLEAN_DIRS += debug-$${abi} release-$${abi}
     }
-    DISTCLEAN_DIRS += .qm
+    DISTCLEAN_DIRS += ui .qm
 } else {
-    DISTCLEAN_DIRS += debug release .qm
+    DISTCLEAN_DIRS += debug release ui .qm
 }
 
 win32 {

From f046bb583c5ee6e5ee9e9646a0d93a482c000c08 Mon Sep 17 00:00:00 2001
From: Tony Mountifield <tony@mountifield.org>
Date: Sun, 23 Aug 2026 22:48:36 +0100
Subject: [PATCH 2/3] Remove any old ui_*.h files in project root

These would be leftover from an older build without UI_DIR set,
and if not removed would still be picked up as dependencies when
generating the Makefiles.
---
 Jamulus.pro | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Jamulus.pro b/Jamulus.pro
index 8a02c16594..b16cb7f77c 100644
--- a/Jamulus.pro
+++ b/Jamulus.pro
@@ -380,8 +380,16 @@ win32 {
 # It doesn't work with multiple targets or architectures.
 RESOURCES += src/resources.qrc
 
+# store ui_*.h files in a directory instead of project root
 UI_DIR += ui
 
+# A tree built in place before UI_DIR was set still has ui_*.h in its root, and
+# they must be deleted before creating the new Makefiles.
+STALE_UI_HEADERS = $$files(ui_*.h)
+for (stale, STALE_UI_HEADERS) {
+    system($$QMAKE_DEL_FILE $$stale)
+}
+
 FORMS_GUI = src/aboutdlgbase.ui \
     src/serverdlgbase.ui
 

From 5572cb5c2dc6de0ba6ff00d10eaedd694967b4df Mon Sep 17 00:00:00 2001
From: Tony Mountifield <tony@mountifield.org>
Date: Mon, 24 Aug 2026 10:40:24 +0100
Subject: [PATCH 3/3] Minor cleanup from reviews

---
 .gitignore  | 4 ++--
 Jamulus.pro | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1b1b93ad19..5fdaa6d3dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,9 +17,9 @@ Makefile.*
 *.user.*
 *.o
 moc_*.cpp
-ui/
-ui_*.h
 moc_predefs.h
+/ui/
+ui_*.h
 .qm/
 *.qm
 qmake_qmake_qm_files.qrc
diff --git a/Jamulus.pro b/Jamulus.pro
index b16cb7f77c..85cb7ba106 100644
--- a/Jamulus.pro
+++ b/Jamulus.pro
@@ -381,7 +381,7 @@ win32 {
 RESOURCES += src/resources.qrc
 
 # store ui_*.h files in a directory instead of project root
-UI_DIR += ui
+UI_DIR = ui
 
 # A tree built in place before UI_DIR was set still has ui_*.h in its root, and
 # they must be deleted before creating the new Makefiles.
@@ -1223,9 +1223,9 @@ android {
     for (abi, ANDROID_ABIS) {
         DISTCLEAN_DIRS += debug-$${abi} release-$${abi}
     }
-    DISTCLEAN_DIRS += ui .qm
+    DISTCLEAN_DIRS += $$UI_DIR .qm
 } else {
-    DISTCLEAN_DIRS += debug release ui .qm
+    DISTCLEAN_DIRS += debug release $$UI_DIR .qm
 }
 
 win32 {