diff options
| author | Craig Scott <craig.scott@qt.io> | 2021-09-07 16:17:32 +1000 |
|---|---|---|
| committer | Craig Scott <craig.scott@qt.io> | 2021-09-08 22:20:06 +1000 |
| commit | 2b0e55a3e2a4631bce12da633f8a9ce889a58878 (patch) | |
| tree | 4069a3738d18861b982666690189791ea3a8bc58 /src/corelib/Qt6CoreMacros.cmake | |
| parent | 0d4b2355e58c3d9d286a266d2f9f50f4b8e0e3b3 (diff) | |
Clean up duplicated code block
Two separate changes addressed the OUTPUT_TARGETS variable not being
set in the calling scope of _qt_internal_process_resource() for a
particular code path, but they did so at different places. Remove one
of them, since we don't need both.
Pick-to: 6.2
Change-Id: Ibc1052e886ec73a99231ada3b7a1bb9e7a873cc4
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/corelib/Qt6CoreMacros.cmake')
| -rw-r--r-- | src/corelib/Qt6CoreMacros.cmake | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index ef14c78186..6170615d5e 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -1848,9 +1848,6 @@ function(_qt_internal_process_resource target resourceName) if(isBinary) # Add generated .rcc target to 'all' set add_custom_target(binary_resource_${resourceName} ALL DEPENDS "${generatedOutfile}") - if(rcc_OUTPUT_TARGETS) - set(${rcc_OUTPUT_TARGETS} "" PARENT_SCOPE) - endif() else() # We can't rely on policy CMP0118 since user project controls it. # We also want SKIP_AUTOGEN known in the target's scope, where we can. |