From c356380154f170bed7c5947d58c9b3c92eee0121 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 1 Apr 2020 21:27:53 +0200 Subject: [PATCH] CMake: Remove special handling of the 'static/shared' features configurejson2cmake handles the 'static' and 'shared' features now. There's no need to special-case it anymore. Change-Id: I956e9f46ebe022b1da862e986ec05f41e1e804e0 Reviewed-by: Alexandru Croitor --- cmake/QtBuild.cmake | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index e8d24a58c6a..91c5e40b335 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -632,17 +632,6 @@ function(qt_generate_global_config_pri_file) get_target_property(enabled_features GlobalConfig INTERFACE_QT_ENABLED_PUBLIC_FEATURES) get_target_property(disabled_features GlobalConfig INTERFACE_QT_DISABLED_PUBLIC_FEATURES) - # configure2cmake skips the "static" feature, so emulate it here for qmake support: - if(QT_BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS) - list(APPEND enabled_features shared) - list(APPEND disabled_features static) - set(qt_build_config_type "shared") - else() - list(APPEND enabled_features static) - list(APPEND disabled_features shared) - set(qt_build_config_type "static") - endif() - string (REPLACE ";" " " enabled_features "${enabled_features}") string (REPLACE ";" " " disabled_features "${disabled_features}")