diff options
| author | Zoltan Gera <zoltan.gera@qt.io> | 2025-12-17 16:39:31 +0200 |
|---|---|---|
| committer | Zoltan Gera <zoltan.gera@qt.io> | 2025-12-17 16:46:49 +0200 |
| commit | 59a257a35039616b64f84d7ef4555fd294ece80b (patch) | |
| tree | 18da42667f4f3c0edb4704d298c4e3adf1980d5c /src/tools/ifcodegen/CMakeLists.txt | |
| parent | a90a9e6b57866fe6d6493d74f6cfbfd4e7df43a1 (diff) | |
When QtIF is built in a single build with other repositories, the cache
vars change the deprecation controlling variables in other repos but
only in a 2nd build pass which leads to unintended consequences.
Pick-to: 6.11
Change-Id: I8a1b94c2f46fa02e865fd6e839f507b2b86327f2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/tools/ifcodegen/CMakeLists.txt')
| -rw-r--r-- | src/tools/ifcodegen/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/ifcodegen/CMakeLists.txt b/src/tools/ifcodegen/CMakeLists.txt index 00f629e6..4a1a7801 100644 --- a/src/tools/ifcodegen/CMakeLists.txt +++ b/src/tools/ifcodegen/CMakeLists.txt @@ -204,7 +204,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/.config "---\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/.config "VERSION: \"${QT_REPO_MODULE_VERSION}\"\n") if(NOT DEFINED QT_DISABLE_DEPRECATED_UP_TO) - set(QT_DISABLE_DEPRECATED_UP_TO "0x050000" CACHE STRING "Give error for using deprecated up to this Qt version.") + set(QT_DISABLE_DEPRECATED_UP_TO "0x050000") endif() file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/.config "QT_DISABLE_DEPRECATED_UP_TO: \"${QT_DISABLE_DEPRECATED_UP_TO}\"\n") @@ -214,7 +214,7 @@ if(NOT DEFINED QT_WARN_DEPRECATED_UP_TO) else() set(REPO_VERSION_HEX "0x060000") endif() - set(QT_WARN_DEPRECATED_UP_TO ${REPO_VERSION_HEX} CACHE STRING "Warn for using deprecated up to this Qt version.") + set(QT_WARN_DEPRECATED_UP_TO ${REPO_VERSION_HEX}) endif() file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/.config "QT_WARN_DEPRECATED_UP_TO: \"${QT_WARN_DEPRECATED_UP_TO}\"\n") |