aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2022-02-04 17:28:34 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-02-12 16:21:40 +0000
commit1585ddf3c9a78893a68e0d0869b71580640bc76a (patch)
tree4307ca6e04c716be0f515367d5aafdebc50fe7db
parent789e9719af738ea6d08415b95b53cdb00d628f82 (diff)
CMake: Clarify doc comment about Xcode common dependency issue
The comment made it sound like ${target} depends on ${target}_qmltyperegistration, but it's the other way around. Amends 1bd0a5ce02352a600367beb5a5421c8f8332e1fe Task-number: QTBUG-95763 Change-Id: I15e89395bee9d9ce88fa4d31901dafc4b956e99b Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit f608b4143e09875bf0bc04a820ca013b959905b9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/qml/Qt6QmlMacros.cmake6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake
index a9898af84e..d85400c0a3 100644
--- a/src/qml/Qt6QmlMacros.cmake
+++ b/src/qml/Qt6QmlMacros.cmake
@@ -2272,10 +2272,12 @@ function(_qt_internal_qml_type_registration target)
endif()
add_dependencies(all_qmltyperegistrations ${target}_qmltyperegistration)
+ # Both ${target} (via target_sources) and ${target}_qmltyperegistration (via add_custom_target
+ # DEPENDS option) depend on ${type_registration_cpp_file}.
# The new Xcode build system requires a common target to drive the generation of files,
# otherwise project configuration fails.
- # Make the ${target}_qmltyperegistration the common target, by adding it as a dependency for
- # ${target} itself.
+ # Make ${target} the common target, by adding it as a dependency for
+ # ${target}_qmltyperegistration.
# The consequence is that the ${target}_qmllint target will now first build ${target} when using
# the Xcode generator (mostly only relevant for projects using Qt for iOS).
# See QTBUG-95763.