Use qmake $$files function to match wildcards

See https://bugreports.qt.io/browse/QTBUG-81003
2026-04-05 01:05:34 +08:00 · 2019-12-30 18:17:25 +00:00
parent dfdc468f9f
commit 1f0c65135d
8 changed files with 159 additions and 159 deletions
--- a/src/blackcore/blackcore.pro
+++ b/src/blackcore/blackcore.pro
@@ -21,31 +21,31 @@ INCLUDEPATH += pch
 DEFINES += LOG_IN_FILE BUILD_BLACKCORE_LIB

 HEADERS += *.h
-HEADERS += $$PWD/application/*.h
-HEADERS += $$PWD/audio/*.h
-HEADERS += $$PWD/context/*.h
-HEADERS += $$PWD/data/*.h
-HEADERS += $$PWD/db/*.h
-HEADERS += $$PWD/vatsim/*.h
-HEADERS += $$PWD/fsd/*.h
-HEADERS += $$PWD/afv/*.h
-HEADERS += $$PWD/afv/audio/*.h
-HEADERS += $$PWD/afv/clients/*.h
-HEADERS += $$PWD/afv/crypto/*.h
-HEADERS += $$PWD/afv/connection/*.h
-HEADERS += $$PWD/afv/model/*.h
+HEADERS += $$files($$PWD/application/*.h)
+HEADERS += $$files($$PWD/audio/*.h)
+HEADERS += $$files($$PWD/context/*.h)
+HEADERS += $$files($$PWD/data/*.h)
+HEADERS += $$files($$PWD/db/*.h)
+HEADERS += $$files($$PWD/vatsim/*.h)
+HEADERS += $$files($$PWD/fsd/*.h)
+HEADERS += $$files($$PWD/afv/*.h)
+HEADERS += $$files($$PWD/afv/audio/*.h)
+HEADERS += $$files($$PWD/afv/clients/*.h)
+HEADERS += $$files($$PWD/afv/crypto/*.h)
+HEADERS += $$files($$PWD/afv/connection/*.h)
+HEADERS += $$files($$PWD/afv/model/*.h)

 SOURCES += *.cpp
-SOURCES += $$PWD/context/*.cpp
-SOURCES += $$PWD/data/*.cpp
-SOURCES += $$PWD/db/*.cpp
-SOURCES += $$PWD/vatsim/*.cpp
-SOURCES += $$PWD/fsd/*.cpp
-SOURCES += $$PWD/afv/audio/*.cpp
-SOURCES += $$PWD/afv/clients/*.cpp
-SOURCES += $$PWD/afv/crypto/*.cpp
-SOURCES += $$PWD/afv/connection/*.cpp
-SOURCES += $$PWD/afv/model/*.cpp
+SOURCES += $$files($$PWD/context/*.cpp)
+SOURCES += $$files($$PWD/data/*.cpp)
+SOURCES += $$files($$PWD/db/*.cpp)
+SOURCES += $$files($$PWD/vatsim/*.cpp)
+SOURCES += $$files($$PWD/fsd/*.cpp)
+SOURCES += $$files($$PWD/afv/audio/*.cpp)
+SOURCES += $$files($$PWD/afv/clients/*.cpp)
+SOURCES += $$files($$PWD/afv/crypto/*.cpp)
+SOURCES += $$files($$PWD/afv/connection/*.cpp)
+SOURCES += $$files($$PWD/afv/model/*.cpp)

 LIBS *= -lvatsimauth
 LIBS *= -lsodium
--- a/src/blackgui/blackgui.pro
+++ b/src/blackgui/blackgui.pro
@@ -34,37 +34,37 @@ DEFINES += LOG_IN_FILE BUILD_BLACKGUI_LIB QWT_DLL

 HEADERS += *.h
 SOURCES += *.cpp
-HEADERS += $$PWD/models/*.h
-SOURCES += $$PWD/models/*.cpp
-HEADERS += $$PWD/menus/*.h
-SOURCES += $$PWD/menus/*.cpp
+HEADERS += $$files($$PWD/models/*.h)
+SOURCES += $$files($$PWD/models/*.cpp)
+HEADERS += $$files($$PWD/menus/*.h)
+SOURCES += $$files($$PWD/menus/*.cpp)

-HEADERS += $$PWD/views/*.h
-SOURCES += $$PWD/views/*.cpp
-FORMS   += $$PWD/views/*.ui
+HEADERS += $$files($$PWD/views/*.h)
+SOURCES += $$files($$PWD/views/*.cpp)
+FORMS   += $$files($$PWD/views/*.ui)

-HEADERS += $$PWD/components/*.h
-HEADERS += $$PWD/settings/*.h
-SOURCES += $$PWD/components/*.cpp
-SOURCES += $$PWD/settings/*.cpp
-FORMS   += $$PWD/components/*.ui
+HEADERS += $$files($$PWD/components/*.h)
+HEADERS += $$files($$PWD/settings/*.h)
+SOURCES += $$files($$PWD/components/*.cpp)
+SOURCES += $$files($$PWD/settings/*.cpp)
+FORMS   += $$files($$PWD/components/*.ui)

-HEADERS += $$PWD/filters/*.h
-SOURCES += $$PWD/filters/*.cpp
-FORMS   += $$PWD/filters/*.ui
+HEADERS += $$files($$PWD/filters/*.h)
+SOURCES += $$files($$PWD/filters/*.cpp)
+FORMS   += $$files($$PWD/filters/*.ui)

-HEADERS += $$PWD/editors/*.h
-SOURCES += $$PWD/editors/*.cpp
-FORMS   += $$PWD/editors/*.ui
+HEADERS += $$files($$PWD/editors/*.h)
+SOURCES += $$files($$PWD/editors/*.cpp)
+FORMS   += $$files($$PWD/editors/*.ui)

-HEADERS += $$PWD/graphs/*.h
-SOURCES += $$PWD/graphs/*.cpp
+HEADERS += $$files($$PWD/graphs/*.h)
+SOURCES += $$files($$PWD/graphs/*.cpp)

-FORMS   += $$PWD/*.ui
+FORMS   += $$files($$PWD/*.ui)

 win32 {
-    HEADERS += $$PWD/win/*.h
-    SOURCES += $$PWD/win/*.cpp
+    HEADERS += $$files($$PWD/win/*.h)
+    SOURCES += $$files($$PWD/win/*.cpp)
 }

 win32 {
@@ -84,8 +84,8 @@ DESTDIR = $$DestRoot/lib
 DLLDESTDIR = $$DestRoot/bin

 OTHER_FILES += ./share/qss/*.qss ./share/qss/*.qss.in ./share/qss/*.css
-COPY_FILES += $$PWD/share/qss/*.qss
-COPY_FILES += $$PWD/share/qss/*.css
+COPY_FILES += $$files($$PWD/share/qss/*.qss)
+COPY_FILES += $$files($$PWD/share/qss/*.css)

 win32 {
    dlltarget.path = $$PREFIX/bin
--- a/src/blackinput/blackinput.pro
+++ b/src/blackinput/blackinput.pro
@@ -20,8 +20,8 @@ HEADERS += *.h
 SOURCES += *.cpp

 win32 {
-    HEADERS += $$PWD/win/*.h
-    SOURCES += $$PWD/win/*.cpp
+    HEADERS += $$files($$PWD/win/*.h)
+    SOURCES += $$files($$PWD/win/*.cpp)

    DEFINES += DIRECTINPUT_VERSION=0x0800

@@ -29,13 +29,13 @@ win32 {
 }

 unix:!macx {
-    HEADERS += $$PWD/linux/*.h
-    SOURCES += $$PWD/linux/*.cpp
+    HEADERS += $$files($$PWD/linux/*.h)
+    SOURCES += $$files($$PWD/linux/*.cpp)
 }

 macx {
-    HEADERS += $$PWD/macos/*.h
-    OBJECTIVE_SOURCES += $$PWD/macos/*.mm
+    HEADERS += $$files($$PWD/macos/*.h)
+    OBJECTIVE_SOURCES += $$files($$PWD/macos/*.mm)
    LIBS += -framework CoreFoundation -framework ApplicationServices -framework Foundation -framework AppKit
 }

--- a/src/blackmisc/blackmisc.pro
+++ b/src/blackmisc/blackmisc.pro
@@ -26,55 +26,55 @@ TRANSLATIONS += translations/blackmisc_i18n_de.ts \
                translations/blackmisc_i18n_en.ts

 HEADERS +=  *.h \
-            $$PWD/audio/*.h \
-#            $$PWD/audio/settings/*.h \
-            $$PWD/aviation/*.h \
-            $$PWD/db/*.h \
-            $$PWD/geo/*.h \
-            $$PWD/input/*.h \
-            $$PWD/math/*.h \
-            $$PWD/network/*.h \
-            $$PWD/network/data/*.h \
-            $$PWD/network/settings/*.h \
-            $$PWD/network/external/*.h \
-            $$PWD/pq/*.h \
-            $$PWD/simulation/*.h \
-            $$PWD/simulation/data/*.h \
-            $$PWD/simulation/settings/*.h \
-            $$PWD/simulation/flightgear/*.h \
-            $$PWD/simulation/fscommon/*.h \
-            $$PWD/simulation/fsx/*.h \
-            $$PWD/simulation/xplane/*.h \
-            $$PWD/thirdparty/*.h \
-            $$PWD/test/*.h \
-            $$PWD/weather/*.h \
+            $$files($$PWD/audio/*.h) \
+#            $$files($$PWD/audio/settings/*.h) \
+            $$files($$PWD/aviation/*.h) \
+            $$files($$PWD/db/*.h) \
+            $$files($$PWD/geo/*.h) \
+            $$files($$PWD/input/*.h) \
+            $$files($$PWD/math/*.h) \
+            $$files($$PWD/network/*.h) \
+            $$files($$PWD/network/data/*.h) \
+            $$files($$PWD/network/settings/*.h) \
+            $$files($$PWD/network/external/*.h) \
+            $$files($$PWD/pq/*.h) \
+            $$files($$PWD/simulation/*.h) \
+            $$files($$PWD/simulation/data/*.h) \
+            $$files($$PWD/simulation/settings/*.h) \
+            $$files($$PWD/simulation/flightgear/*.h) \
+            $$files($$PWD/simulation/fscommon/*.h) \
+            $$files($$PWD/simulation/fsx/*.h) \
+            $$files($$PWD/simulation/xplane/*.h) \
+            $$files($$PWD/thirdparty/*.h) \
+            $$files($$PWD/test/*.h) \
+            $$files($$PWD/weather/*.h) \

 SOURCES +=  *.cpp \
-            $$PWD/audio/*.cpp \
-#           $$PWD/audio/settings/*.cpp \
-            $$PWD/aviation/*.cpp \
-            $$PWD/db/*.cpp \
-            $$PWD/geo/*.cpp \
-            $$PWD/input/*.cpp \
-            $$PWD/math/*.cpp \
-            $$PWD/network/*.cpp \
-            $$PWD/network/settings/*.cpp \
-            $$PWD/network/external/*.cpp \
-            $$PWD/pq/*.cpp \
-            $$PWD/simulation/*.cpp \
-            $$PWD/simulation/data/*.cpp \
-            $$PWD/simulation/settings/*.cpp \
-            $$PWD/simulation/flightgear/*.cpp \
-            $$PWD/simulation/fscommon/*.cpp \
-            $$PWD/simulation/fsx/*.cpp \
-            $$PWD/simulation/xplane/*.cpp \
-            $$PWD/thirdparty/*.cpp \
-            $$PWD/test/*.cpp \
-            $$PWD/weather/*.cpp \
+            $$files($$PWD/audio/*.cpp) \
+#           $$files($$PWD/audio/settings/*.cpp) \
+            $$files($$PWD/aviation/*.cpp) \
+            $$files($$PWD/db/*.cpp) \
+            $$files($$PWD/geo/*.cpp) \
+            $$files($$PWD/input/*.cpp) \
+            $$files($$PWD/math/*.cpp) \
+            $$files($$PWD/network/*.cpp) \
+            $$files($$PWD/network/settings/*.cpp) \
+            $$files($$PWD/network/external/*.cpp) \
+            $$files($$PWD/pq/*.cpp) \
+            $$files($$PWD/simulation/*.cpp) \
+            $$files($$PWD/simulation/data/*.cpp) \
+            $$files($$PWD/simulation/settings/*.cpp) \
+            $$files($$PWD/simulation/flightgear/*.cpp) \
+            $$files($$PWD/simulation/fscommon/*.cpp) \
+            $$files($$PWD/simulation/fsx/*.cpp) \
+            $$files($$PWD/simulation/xplane/*.cpp) \
+            $$files($$PWD/thirdparty/*.cpp) \
+            $$files($$PWD/test/*.cpp) \
+            $$files($$PWD/weather/*.cpp) \

 macx {
-    HEADERS += $$PWD/macos/microphoneaccess.h
-    OBJECTIVE_SOURCES += $$PWD/macos/microphoneaccess.mm
+    HEADERS += $$files($$PWD/macos/microphoneaccess.h)
+    OBJECTIVE_SOURCES += $$files($$PWD/macos/microphoneaccess.mm)
 }

 INCLUDEPATH *= $$EXTERNALSROOT/common/include/crashpad
--- a/src/blacksound/blacksound.pro
+++ b/src/blacksound/blacksound.pro
@@ -16,16 +16,16 @@ DEPENDPATH += . ..
 DEFINES += LOG_IN_FILE BUILD_BLACKSOUND_LIB

 HEADERS += *.h
-HEADERS += $$PWD/wav/wavfile.h
-HEADERS += $$PWD/dsp/*.h
-HEADERS += $$PWD/codecs/*.h
-HEADERS += $$PWD/sampleprovider/*.h
+HEADERS += $$files($$PWD/wav/wavfile.h)
+HEADERS += $$files($$PWD/dsp/*.h)
+HEADERS += $$files($$PWD/codecs/*.h)
+HEADERS += $$files($$PWD/sampleprovider/*.h)

 SOURCES += *.cpp
-SOURCES += $$PWD/wav/wavfile.cpp
-SOURCES += $$PWD/dsp/*.cpp
-SOURCES += $$PWD/codecs/*.cpp
-SOURCES += $$PWD/sampleprovider/*.cpp
+SOURCES += $$files($$PWD/wav/wavfile.cpp)
+SOURCES += $$files($$PWD/dsp/*.cpp)
+SOURCES += $$files($$PWD/codecs/*.cpp)
+SOURCES += $$files($$PWD/sampleprovider/*.cpp)

 LIBS *= -lopus

@@ -33,7 +33,7 @@ DESTDIR = $$DestRoot/lib
 DLLDESTDIR = $$DestRoot/bin

 OTHER_FILES += ./share/sounds/*.wav ./share/sounds/readme.txt
-COPY_FILES += $$PWD/share/sounds/*
+COPY_FILES += $$files($$PWD/share/sounds/*)
 # RESOURCES +=

 win32 {
--- a/src/blacksound/codecs/codecs.pri
+++ b/src/blacksound/codecs/codecs.pri
@@ -1,7 +1,7 @@
 SOURCES += \
-    $$PWD/opusdecoder.cpp \
-    $$PWD/opusencoder.cpp \
+    $$files($$PWD/codecs/opusdecoder.cpp) \
+    $$files($$PWD/codecs/opusencoder.cpp) \

 HEADERS += \
-    $$PWD/opusdecoder.h \
-    $$PWD/opusencoder.h \
+    $$files($$PWD/codecs/opusdecoder.h) \
+    $$files($$PWD/codecs/opusencoder.h) \
--- a/src/blacksound/sampleprovider/sampleprovider.pri
+++ b/src/blacksound/sampleprovider/sampleprovider.pri
@@ -1,22 +1,22 @@
 SOURCES += \
-    $$PWD/bufferedwaveprovider.cpp \
-    $$PWD/mixingsampleprovider.cpp \
-    $$PWD/equalizersampleprovider.cpp \
-    $$PWD/pinknoisegenerator.cpp \
-    $$PWD/resourcesound.cpp \
-    $$PWD/resourcesoundsampleprovider.cpp \
-    $$PWD/samples.cpp \
-    $$PWD/sawtoothgenerator.cpp \
-    $$PWD/simplecompressoreffect.cpp \
+    $$files($$PWD/sampleprovider/bufferedwaveprovider.cpp) \
+    $$files($$PWD/sampleprovider/mixingsampleprovider.cpp) \
+    $$files($$PWD/sampleprovider/equalizersampleprovider.cpp) \
+    $$files($$PWD/sampleprovider/pinknoisegenerator.cpp) \
+    $$files($$PWD/sampleprovider/resourcesound.cpp) \
+    $$files($$PWD/sampleprovider/resourcesoundsampleprovider.cpp) \
+    $$files($$PWD/sampleprovider/samples.cpp) \
+    $$files($$PWD/sampleprovider/sawtoothgenerator.cpp) \
+    $$files($$PWD/sampleprovider/simplecompressoreffect.cpp) \

 HEADERS += \
-    $$PWD/bufferedwaveprovider.h \
-    $$PWD/mixingsampleprovider.h \
-    $$PWD/resourcesound.h \
-    $$PWD/resourcesoundsampleprovider.h \
-    $$PWD/sampleprovider.h \
-    $$PWD/equalizersampleprovider.h \
-    $$PWD/pinknoisegenerator.h \
-    $$PWD/samples.h \
-    $$PWD/sawtoothgenerator.h \
-    $$PWD/simplecompressoreffect.h \
+    $$files($$PWD/sampleprovider/bufferedwaveprovider.h) \
+    $$files($$PWD/sampleprovider/mixingsampleprovider.h) \
+    $$files($$PWD/sampleprovider/resourcesound.h) \
+    $$files($$PWD/sampleprovider/resourcesoundsampleprovider.h) \
+    $$files($$PWD/sampleprovider/sampleprovider.h) \
+    $$files($$PWD/sampleprovider/equalizersampleprovider.h) \
+    $$files($$PWD/sampleprovider/pinknoisegenerator.h) \
+    $$files($$PWD/sampleprovider/samples.h) \
+    $$files($$PWD/sampleprovider/sawtoothgenerator.h) \
+    $$files($$PWD/sampleprovider/simplecompressoreffect.h) \