diff options
| -rw-r--r-- | src/qml/Qt6QmlMacros.cmake | 6 | ||||
| -rw-r--r-- | src/qml/doc/src/cmake/qt_add_qml_module.qdoc | 13 |
2 files changed, 16 insertions, 3 deletions
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake index a75a8e794b..6878834d18 100644 --- a/src/qml/Qt6QmlMacros.cmake +++ b/src/qml/Qt6QmlMacros.cmake @@ -475,7 +475,7 @@ function(qt6_add_qml_module target) QT_QML_MODULE_PLUGIN_TYPES_FILE QT_QML_MODULE_RESOURCE_PATHS QT_QMLCACHEGEN_DIRECT_CALLS - QT_QMLCACHEGEN_BINARY + QT_QMLCACHEGEN_EXECUTABLE QT_QMLCACHEGEN_ARGUMENTS ) foreach(prop IN LISTS ensure_set_properties) @@ -1350,7 +1350,7 @@ function(qt6_target_qml_sources target) if(NOT no_cachegen AND arg_QML_FILES) _qt_internal_genex_getproperty(types_file ${target} QT_QML_MODULE_PLUGIN_TYPES_FILE) - _qt_internal_genex_getproperty(qmlcachegen ${target} QT_QMLCACHEGEN_BINARY) + _qt_internal_genex_getproperty(qmlcachegen ${target} QT_QMLCACHEGEN_EXECUTABLE) _qt_internal_genex_getproperty(direct_calls ${target} QT_QMLCACHEGEN_DIRECT_CALLS) _qt_internal_genex_getjoinedproperty(arguments ${target} QT_QMLCACHEGEN_ARGUMENTS "$<SEMICOLON>" "$<SEMICOLON>" @@ -1376,7 +1376,7 @@ function(qt6_target_qml_sources target) ) # For direct evaluation in if() below - get_target_property(cachegen_prop ${target} QT_QMLCACHEGEN_BINARY) + get_target_property(cachegen_prop ${target} QT_QMLCACHEGEN_EXECUTABLE) if(cachegen_prop) if(cachegen_prop STREQUAL "qmlcachegen" OR cachegen_prop STREQUAL "qmlsc") # If it's qmlcachegen or qmlsc, don't go looking for other programs of that name diff --git a/src/qml/doc/src/cmake/qt_add_qml_module.qdoc b/src/qml/doc/src/cmake/qt_add_qml_module.qdoc index 00926e6678..4b42d7faac 100644 --- a/src/qml/doc/src/cmake/qt_add_qml_module.qdoc +++ b/src/qml/doc/src/cmake/qt_add_qml_module.qdoc @@ -245,6 +245,19 @@ found at the following resource paths: \li \c{/my.company.com/imports/MyCo/Frames/AnotherFrame.qml} \endlist +In the rare case that you want to override the automatic selection of the +qmlcachegen program to be used, you may set the \c QT_QMLCACHEGEN_EXECUTABLE +target property on the module target. For example: + +\badcode +set_target_properties(someTarget PROPERTIES + QT_QMLCACHEGEN_EXECUTABLE qmlcachegen +) +\endcode + +This explicitly selects qmlcachegen as the program to be used, even if +better alternatives are available. + \target qmllint-auto \section2 Linting QML sources |