Skip to content

Put UI header files in their own directory #3921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
softins wants to merge 3 commits into
base: main
Choose a base branch
from
+14 −3
Open

Put UI header files in their own directory #3921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a660290
Put UI header files in their own directory
softins Aug 16, 2026
f046bb5
Remove any old ui_*.h files in project root
softins Aug 23, 2026
5572cb5
Minor cleanup from reviews
softins Aug 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ Makefile.*
*.user.*
*.o
moc_*.cpp
ui_*.h
moc_predefs.h
/ui/
ui_*.h
.qm/
*.qm
qmake_qmake_qm_files.qrc
Expand Down
14 changes: 12 additions & 2 deletions Jamulus.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +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

Expand Down Expand Up @@ -1213,9 +1223,9 @@ android {
for (abi, ANDROID_ABIS) {
DISTCLEAN_DIRS += debug-$${abi} release-$${abi}
}
DISTCLEAN_DIRS += .qm
DISTCLEAN_DIRS += $$UI_DIR .qm
} else {
DISTCLEAN_DIRS += debug release .qm
DISTCLEAN_DIRS += debug release $$UI_DIR .qm
}

win32 {
Expand Down
Loading