From eb0c781bde358a54598236eac678cac2ddd6288d Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Tue, 23 Apr 2024 15:17:03 +0300 Subject: [PATCH] CMake: remove QT_EDITION from qconfig.pri QT_EDITION is not used anywhere in Qt6, stop adding it to qconfig.pri. Packaging currently unnecessarily patches the edition when handling the first steps after integration and again during install time. Pick-to: 6.5 6.2 Change-Id: I0ad1933ec8fea741796fdf6d13f627a657aac401 Reviewed-by: Alexey Edelev Reviewed-by: Joerg Bornemann Reviewed-by: Iikka Eklund (cherry picked from commit d04deafed932d955e2e94324ec5b1a261fdb3332) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtPriHelpers.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake index 0151fcb77b0..fd7bc040b5a 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -807,8 +807,6 @@ QT_PATCH_VERSION = ${PROJECT_VERSION_PATCH} list(APPEND extra_statements "QT_ARCHS = ${architectures}") endif() - list(APPEND extra_statements "QT_EDITION = Open Source") - if(WASM) list(APPEND extra_statements "QT_EMCC_VERSION = ${EMCC_VERSION}")