diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-11-10 22:42:29 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-11-10 22:42:29 +0200 |
| commit | f5701f0def37fcc0c2b38ae9552eb3a896a34687 (patch) | |
| tree | aa9a7ebb39bedb6794f199d94525f5ddfb696308 /src/qmltyperegistrar/qmltypes.prf | |
| parent | da0aac1057552048f59075beb31861a6cc076684 (diff) | |
| parent | e24effdceb3a504182ae271200408750991aa94a (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into tqtc/lts-5.15-opensourcev5.15.8-lts-lgpl
Change-Id: I2e0f34eea87c1393dff82f153650eccf5048248f
Diffstat (limited to 'src/qmltyperegistrar/qmltypes.prf')
| -rw-r--r-- | src/qmltyperegistrar/qmltypes.prf | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/qmltyperegistrar/qmltypes.prf b/src/qmltyperegistrar/qmltypes.prf index 2cc0027b7e..471bb6e3b0 100644 --- a/src/qmltyperegistrar/qmltypes.prf +++ b/src/qmltyperegistrar/qmltypes.prf @@ -81,12 +81,18 @@ qmltyperegistrar_compiler.output = $$TYPEREGISTRATIONS qmltyperegistrar_compiler.variable_out = SOURCES qmltyperegistrar_compiler.name = Automatic QML type registration qmltyperegistrar_compiler.dependency_type = TYPE_C - -qmltyperegistrar_qmltypes.input = METATYPES_JSON -qmltyperegistrar_qmltypes.depends = $$TYPEREGISTRATIONS -qmltyperegistrar_qmltypes.output = $$QMLTYPES_FILENAME -qmltyperegistrar_qmltypes.CONFIG = no_link -qmltyperegistrar_qmltypes.commands = $$escape_expand(\\n) # force creation of rule +QMAKE_EXTRA_COMPILERS += qmltyperegistrar_compiler + +!contains(TEMPLATE, "vc.*") { # work around QTBUG-91033 + # Create a fake extra compiler to announce that we generate $$QMLTYPES_FILENAME. + # This allows us to use $$QMLTYPES_FILENAME as input in other extra compilers. + qmltyperegistrar_qmltypes.input = METATYPES_JSON + qmltyperegistrar_qmltypes.depends = $$TYPEREGISTRATIONS + qmltyperegistrar_qmltypes.output = $$QMLTYPES_FILENAME + qmltyperegistrar_qmltypes.CONFIG = no_link + qmltyperegistrar_qmltypes.commands = $$escape_expand(\\n) # force creation of rule + QMAKE_EXTRA_COMPILERS += qmltyperegistrar_qmltypes +} install_qmltypes { INSTALL_QML_FILES = false @@ -109,5 +115,3 @@ install_qmltypes { else: COPIES += do_install_qmltypes } } - -QMAKE_EXTRA_COMPILERS += qmltyperegistrar_compiler qmltyperegistrar_qmltypes |