diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2022-01-26 15:44:09 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2022-01-26 23:57:00 +0000 |
| commit | 4ecbebebf7bfe1eaf5685abca9e068087587df03 (patch) | |
| tree | b6c028eb45bd8816bd2f7617fde5400b47553339 /src | |
| parent | c8621da85265ecec8968eb54bfaa1558474f241b (diff) | |
Check if 'aab' target exists when adding <target>_make_aab as dependency
The global 'aab' target has its own switch QT_NO_GLOBAL_AAB_TARGET
that prevents it from being created. We need to check if 'aab' target
exists before adding <target>_make_aab as a dependency.
Pick-to: 6.3 6.2
Change-Id: Iea569e3b6c7dfb6d0efa60dd2001fb9de161f725
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/Qt6AndroidMacros.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index 22e3ca614d..56faedb121 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -327,9 +327,11 @@ function(qt6_android_add_apk_target target) endif() # Make global apk and aab targets depend on the current apk target. + if(TARGET aab) + add_dependencies(aab ${target}_make_aab) + endif() if(TARGET apk) add_dependencies(apk ${target}_make_apk) - add_dependencies(aab ${target}_make_aab) _qt_internal_create_global_apk_all_target_if_needed() endif() |