From b11a6900e601e605475e94f46e2f5d85ba22a2df Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 24 Jul 2023 14:48:57 +0200 Subject: [PATCH] Build: Remove feature from the olden times We don't set this to anything else anymore, so remove the option to set it. Change-Id: I9e2aced8909d557e3a4f0b8ca8fff70ac6ec2e1d Reviewed-by: Cristian Adam Reviewed-by: Qt CI Bot Reviewed-by: --- cmake/QtCreatorAPI.cmake | 8 +------- src/plugins/updateinfo/CMakeLists.txt | 1 - src/plugins/updateinfo/UpdateInfo.json.in | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index effbb454047..54384fcdfe3 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -320,7 +320,7 @@ endfunction(add_qtc_library) function(add_qtc_plugin target_name) cmake_parse_arguments(_arg "SKIP_INSTALL;INTERNAL_ONLY;SKIP_TRANSLATION;EXPORT;SKIP_PCH" - "VERSION;COMPAT_VERSION;PLUGIN_JSON_IN;PLUGIN_PATH;PLUGIN_NAME;OUTPUT_NAME;BUILD_DEFAULT;PLUGIN_CLASS" + "VERSION;COMPAT_VERSION;PLUGIN_PATH;PLUGIN_NAME;OUTPUT_NAME;BUILD_DEFAULT;PLUGIN_CLASS" "CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;PUBLIC_DEFINES;INCLUDES;PUBLIC_INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS;PLUGIN_DEPENDS;PLUGIN_RECOMMENDS;PLUGIN_TEST_DEPENDS;PROPERTIES" ${ARGN} ) @@ -431,12 +431,6 @@ function(add_qtc_plugin target_name) string(REPLACE "$$QTCREATOR_COPYRIGHT_YEAR" "\${IDE_COPYRIGHT_YEAR}" plugin_json_in ${plugin_json_in}) string(REPLACE "$$QTC_PLUGIN_REVISION" "\${QTC_PLUGIN_REVISION}" plugin_json_in ${plugin_json_in}) string(REPLACE "$$dependencyList" "\${IDE_PLUGIN_DEPENDENCY_STRING}" plugin_json_in ${plugin_json_in}) - if(_arg_PLUGIN_JSON_IN) - #e.g. UPDATEINFO_EXPERIMENTAL_STR=true - string(REGEX REPLACE "=.*$" "" json_key ${_arg_PLUGIN_JSON_IN}) - string(REGEX REPLACE "^.*=" "" json_value ${_arg_PLUGIN_JSON_IN}) - string(REPLACE "$$${json_key}" "${json_value}" plugin_json_in ${plugin_json_in}) - endif() string(CONFIGURE "${plugin_json_in}" plugin_json) file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${name}.json" diff --git a/src/plugins/updateinfo/CMakeLists.txt b/src/plugins/updateinfo/CMakeLists.txt index 2507f99964b..5049f351f0f 100644 --- a/src/plugins/updateinfo/CMakeLists.txt +++ b/src/plugins/updateinfo/CMakeLists.txt @@ -1,7 +1,6 @@ add_qtc_plugin(UpdateInfo DEPENDS Qt::Xml PLUGIN_DEPENDS Core - PLUGIN_JSON_IN UPDATEINFO_EXPERIMENTAL_STR=true SOURCES settingspage.cpp settingspage.h diff --git a/src/plugins/updateinfo/UpdateInfo.json.in b/src/plugins/updateinfo/UpdateInfo.json.in index 5331281feaf..f2f060d44a7 100644 --- a/src/plugins/updateinfo/UpdateInfo.json.in +++ b/src/plugins/updateinfo/UpdateInfo.json.in @@ -2,7 +2,7 @@ \"Name\" : \"UpdateInfo\", \"Version\" : \"$$QTCREATOR_VERSION\", \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", - \"DisabledByDefault\" : $$UPDATEINFO_EXPERIMENTAL_STR, + \"DisabledByDefault\" : true, \"Vendor\" : \"The Qt Company Ltd\", \"Copyright\" : \"(C) $$QTCREATOR_COPYRIGHT_YEAR The Qt Company Ltd\", \"License\" : [ \"Commercial Usage\",