dandri/proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2026-05-25 09:54:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Qt6: makefile fixes

Browse Source
This commit is contained in:
Philippe Teuwen
2026-02-27 00:36:56 +01:00
parent b2d34ddc15
commit d5d8a7192a
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/Makefile
+10 -3
View File
@@ -320,7 +320,7 @@ PM3INCLUDES += $(PYTHONLIBINC)
ifneq ($(SKIPQT),1)
# Check for correctly configured Qt6
QTINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags Qt6Core Qt6Widgets Qt6Gui 2>/dev/null)
QTLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs Qt6Core Qt6Widgets 2>/dev/null)
QTLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs Qt6Core Qt6Widgets Qt6Gui 2>/dev/null)
MOC = $(shell $(PKG_CONFIG_ENV) pkg-config --variable=libexecdir Qt6Core)/moc
UIC = $(shell $(PKG_CONFIG_ENV) pkg-config --variable=libexecdir Qt6Core)/uic
QMAKE = $(shell $(PKG_CONFIG_ENV) pkg-config --variable=bindir Qt6Core)/qmake
@@ -358,7 +358,10 @@ ifneq ($(SKIPQT),1)
endif
endif
LDLIBS += $(QTLDLIBS)
CXXINCLUDES += $(QTINCLUDES)
# Treat Qt headers as system headers, to avoid a bug with Qt 6.6.3
QTINCLUDES_FIX = $(patsubst -I%,-isystem %,$(QTINCLUDES))
CXXINCLUDES += $(QTINCLUDES_FIX)
## GD (optional)
ifneq ($(SKIPGD),1)
@@ -875,7 +878,11 @@ src/ui/ui_overlays.h: src/ui/overlays.ui
$(info [-] UIC $@)
$(Q)$(UIC) $^ > $@
# fix the header generated by some Qt6 versions (seen on 6.4.2 & 6.6.3)
$(Q)sed -i 's/&QLabel::setNum/qOverload<int>(\&QLabel::setNum)/g' $@
ifeq ($(platform),Darwin)
$(Q)sed -E -i '' 's/&QLabel::setNum/qOverload<int>(\&QLabel::setNum)/g' $@
else
$(Q)sed -i 's/&QLabel::setNum/qOverload<int>(\&QLabel::setNum)/g' $@
endif
src/ui/ui_image.h: src/ui/image.ui
$(info [-] UIC $@)