diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-07-05 17:37:15 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-07-20 13:00:15 +0200 |
commit | a83cf2c10ebc19da2a97c1fc4ac7664c8b85b5e7 (patch) | |
tree | b14d32d07aeecdcee039e638c6431329f3bc90a2 /src/corelib/tools/qmap.h | |
parent | 8c1210c74515733c386e0bcc733e3a5b99070500 (diff) |
CMake: Fix qt6_extract_metatypes json file generation rule
Change the copying of
${CMAKE_CURRENT_BINARY_DIR}/${target}_metatypes.json
to
${prefix}/lib/metatypes/${target}_metatypes.json
to happen as part of the command generating the file, rather
than copying the file as part of a separate custom target or
POST_BUILD event.
This ensures that the custom commands in qt6_qml_type_registration
that use those files as dependencies will cause them to be
generated before the qml type registration happens, thus eliminating
errors like
Error 5 while parsing
qtbase/lib/metatypes/qt6quick_metatypes.json: illegal value
Fixes: QTBUG-94942
Change-Id: Idddd73786d1a622984965c60ac9b4c3bc2c13ab5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit bcca14a1933de9f188950a9a2d3a450a0772d479)
Reviewed-by: Craig Scott <craig.scott@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/corelib/tools/qmap.h')
0 files changed, 0 insertions, 0 deletions