From 3b9330cd405a0b4c75f1a8bcd836e184fdf38e06 Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Thu, 13 Oct 2022 11:29:58 +0200 Subject: [PATCH] Replace `arg_BIG_RESOURCES` with `rcc_BIG_RESOURCES` This fixes a typo in the name of the variable, `arg_BIG_RESOURCES`, as it should be `rcc_BIG_RESOURCES` instead, because `rcc` is the prefix given to the corresponding `cmake_parse_arguments`. Fixes: QTBUG-107575 Change-Id: I1ef276ed90f8603121d1dc6e117c02ff821900ef Reviewed-by: Alexey Edelev Reviewed-by: Alexandru Croitor --- src/corelib/Qt6CoreMacros.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index f7cb1a0d3a..915b0dd972 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -1722,22 +1722,22 @@ function(_qt_internal_process_resource target resourceName) if("${rcc_OPTIONS}" MATCHES "-binary") set(isBinary TRUE) - if(arg_BIG_RESOURCES) + if(rcc_BIG_RESOURCES) message(FATAL_ERROR "BIG_RESOURCES cannot be used together with the -binary option.") endif() endif() - if(arg_BIG_RESOURCES AND CMAKE_GENERATOR STREQUAL "Xcode" AND IOS) + if(rcc_BIG_RESOURCES AND CMAKE_GENERATOR STREQUAL "Xcode" AND IOS) message(WARNING "Due to CMake limitations, the BIG_RESOURCES option can't be used when building " "for iOS. " "See https://bugreports.qt.io/browse/QTBUG-103497 for details. " "Falling back to using regular resources. " ) - set(arg_BIG_RESOURCES OFF) + set(rcc_BIG_RESOURCES OFF) endif() - if(arg_BIG_RESOURCES AND CMAKE_VERSION VERSION_LESS "3.17") + if(rcc_BIG_RESOURCES AND CMAKE_VERSION VERSION_LESS "3.17") message(WARNING "The BIG_RESOURCES option does not work reliably with CMake < 3.17. " "Consider upgrading to a more recent CMake version or disable the BIG_RESOURCES "