From 8dff37f0d3ebcae0aa4f4839165fb70fa9cd965c Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 2 Jun 2020 13:12:41 +0200 Subject: [PATCH] Disable ClangRefactoring by default It is too unstable even for experimental status. Change-Id: I38e483eaece00aec0211a81414c6c5a000bf283f Reviewed-by: Marco Bubke Reviewed-by: Christian Kandeler Reviewed-by: Kai Koehne Reviewed-by: Christian Stenger --- cmake/QtCreatorAPI.cmake | 8 ++++++-- qbs/modules/libclang/libclang.qbs | 2 +- src/plugins/clangpchmanager/CMakeLists.txt | 1 + src/plugins/clangrefactoring/CMakeLists.txt | 1 + src/plugins/plugins.pro | 4 ++-- src/shared/clang/clang_installation.pri | 4 ++-- src/tools/tools.pro | 4 ++-- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index 4eed007b0e5..4249e718242 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -234,7 +234,7 @@ endfunction(add_qtc_library) function(add_qtc_plugin target_name) cmake_parse_arguments(_arg "EXPERIMENTAL;SKIP_DEBUG_CMAKE_FILE_CHECK;SKIP_INSTALL;INTERNAL_ONLY;SKIP_TRANSLATION" - "VERSION;COMPAT_VERSION;PLUGIN_JSON_IN;PLUGIN_PATH;PLUGIN_NAME;OUTPUT_NAME" + "VERSION;COMPAT_VERSION;PLUGIN_JSON_IN;PLUGIN_PATH;PLUGIN_NAME;OUTPUT_NAME;BUILD_DEFAULT" "CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;PUBLIC_DEFINES;INCLUDES;PUBLIC_INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS;PLUGIN_DEPENDS;PLUGIN_RECOMMENDS" ${ARGN} ) @@ -256,7 +256,11 @@ function(add_qtc_plugin target_name) endif() string(TOUPPER "BUILD_PLUGIN_${target_name}" _build_plugin_var) - set(_build_plugin_default "ON") + if (DEFINED _arg_BUILD_DEFAULT) + set(_build_plugin_default ${_arg_BUILD_DEFAULT}) + else() + set(_build_plugin_default "ON") + endif() if (DEFINED ENV{QTC_${_build_plugin_var}}) set(_build_plugin_default "$ENV{QTC_${_build_plugin_var}}") endif() diff --git a/qbs/modules/libclang/libclang.qbs b/qbs/modules/libclang/libclang.qbs index 9c2cfae23d1..94142e57d88 100644 --- a/qbs/modules/libclang/libclang.qbs +++ b/qbs/modules/libclang/libclang.qbs @@ -64,7 +64,7 @@ Module { return incl != llvmIncludeDir; }) property stringList llvmToolingCxxFlags: clangProbe.llvmToolingCxxFlags - property bool toolingEnabled: !Environment.getEnv("QTC_DISABLE_CLANG_REFACTORING") + property bool toolingEnabled: Environment.getEnv("QTC_ENABLE_CLANG_REFACTORING") validate: { if (!clangProbe.found) { diff --git a/src/plugins/clangpchmanager/CMakeLists.txt b/src/plugins/clangpchmanager/CMakeLists.txt index a012d090c99..c1c9b29f93c 100644 --- a/src/plugins/clangpchmanager/CMakeLists.txt +++ b/src/plugins/clangpchmanager/CMakeLists.txt @@ -1,4 +1,5 @@ add_qtc_plugin(ClangPchManager + BUILD_DEFAULT OFF CONDITION TARGET libclang DEPENDS ClangSupport CPlusPlus DEFINES CLANGPCHMANAGER_LIB diff --git a/src/plugins/clangrefactoring/CMakeLists.txt b/src/plugins/clangrefactoring/CMakeLists.txt index 1e20afad9b7..53930f13dea 100644 --- a/src/plugins/clangrefactoring/CMakeLists.txt +++ b/src/plugins/clangrefactoring/CMakeLists.txt @@ -1,4 +1,5 @@ add_qtc_plugin(ClangRefactoring + BUILD_DEFAULT OFF CONDITION TARGET libclang DEPENDS ClangSupport CPlusPlus PLUGIN_DEPENDS Core CppTools TextEditor ClangPchManager diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 8fb6d384ed8..3e2e78b9d17 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -114,8 +114,8 @@ exists(../shared/qbs/qbs.pro)|!isEmpty(QBS_INSTALL_DIR): \ SUBDIRS += \ clangcodemodel -QTC_DISABLE_CLANG_REFACTORING=$$(QTC_DISABLE_CLANG_REFACTORING) -isEmpty(QTC_DISABLE_CLANG_REFACTORING) { +QTC_ENABLE_CLANG_REFACTORING=$$(QTC_ENABLE_CLANG_REFACTORING) +!isEmpty(QTC_ENABLE_CLANG_REFACTORING) { SUBDIRS += clangrefactoring SUBDIRS += clangpchmanager } diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri index 08838838bca..6e9d425f216 100644 --- a/src/shared/clang/clang_installation.pri +++ b/src/shared/clang/clang_installation.pri @@ -237,8 +237,8 @@ isEmpty(LLVM_VERSION) { LIBCLANG_LIBS += $${CLANG_LIB} isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) { - QTC_DISABLE_CLANG_REFACTORING=$$(QTC_DISABLE_CLANG_REFACTORING) - isEmpty(QTC_DISABLE_CLANG_REFACTORING) { + QTC_ENABLE_CLANG_REFACTORING=$$(QTC_ENABLE_CLANG_REFACTORING) + !isEmpty(QTC_ENABLE_CLANG_REFACTORING) { !contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): LIBTOOLING_LIBS = -L$${LLVM_LIBDIR} LIBTOOLING_LIBS += $$CLANGTOOLING_LIBS $$LLVM_STATIC_LIBS } diff --git a/src/tools/tools.pro b/src/tools/tools.pro index 688ff570afa..b2ef50b040c 100644 --- a/src/tools/tools.pro +++ b/src/tools/tools.pro @@ -27,8 +27,8 @@ mac { SUBDIRS += clangbackend -QTC_DISABLE_CLANG_REFACTORING=$$(QTC_DISABLE_CLANG_REFACTORING) -isEmpty(QTC_DISABLE_CLANG_REFACTORING) { +QTC_ENABLE_CLANG_REFACTORING=$$(QTC_ENABLE_CLANG_REFACTORING) +!isEmpty(QTC_ENABLE_CLANG_REFACTORING) { SUBDIRS += clangrefactoringbackend SUBDIRS += clangpchmanagerbackend }