aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Kosmale <[email protected]>2025-02-19 08:54:53 +0100
committerFabian Kosmale <[email protected]>2025-02-25 19:46:08 +0100
commit254c683e684706b67363b0900ef0c0224db4d245 (patch)
tree7ed7c8b9f01d3c16caaaf116eb968f3f23e1b0f8
parent947fee3c59eb5dc5b1c1876319fd051a52d8b854 (diff)
qmake: Don't pass empty foreign-types list to qmltyperegistrar
Use join's before parameter to only add the foreign-types parameter to the command invocation if there is actually a list of foreign-types to handle. This avoids "cannot open foreign types file" warnings during the build process. Pick-to: 6.9 6.8 Change-Id: I142d0fab44201a3314354173ea30d2f90841a6f4 Reviewed-by: Ulf Hermann <[email protected]> Reviewed-by: Joerg Bornemann <[email protected]>
-rw-r--r--tools/qmltyperegistrar/qmltypes.prf2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qmltyperegistrar/qmltypes.prf b/tools/qmltyperegistrar/qmltypes.prf
index 8011a758fb..7cbdf29d41 100644
--- a/tools/qmltyperegistrar/qmltypes.prf
+++ b/tools/qmltyperegistrar/qmltypes.prf
@@ -81,7 +81,7 @@ QML_TYPEREGISTRAR_FLAGS = \
--import-name=$$QML_IMPORT_NAME \
--major-version=$$QML_IMPORT_MAJOR_VERSION \
--minor-version=$$QML_IMPORT_MINOR_VERSION \
- --foreign-types=$$join(QML_FOREIGN_METATYPES, ',')
+ $$join(QML_FOREIGN_METATYPES, ',', '--foreign-types=')
!isEmpty(QML_PAST_MAJOR_VERSIONS) {
for(past_major_version,QML_PAST_MAJOR_VERSIONS): QML_TYPEREGISTRAR_FLAGS += --past-major-version $$past_major_version