feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Disable ClangRefactoring by default

Browse Source 
It is too unstable even for experimental status.

Change-Id: I38e483eaece00aec0211a81414c6c5a000bf283f
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Eike Ziller
2020-06-02 13:12:41 +02:00
parent 63655081c3
commit 8dff37f0d3
7 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/QtCreatorAPI.cmake
View File

@@ -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()

2
qbs/modules/libclang/libclang.qbs
View File

@@ -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) {

1
src/plugins/clangpchmanager/CMakeLists.txt
View File

@@ -1,4 +1,5 @@
add_qtc_plugin(ClangPchManager
BUILD_DEFAULT OFF
CONDITION TARGET libclang
DEPENDS ClangSupport CPlusPlus
DEFINES CLANGPCHMANAGER_LIB

1
src/plugins/clangrefactoring/CMakeLists.txt
View File

@@ -1,4 +1,5 @@
add_qtc_plugin(ClangRefactoring
BUILD_DEFAULT OFF
CONDITION TARGET libclang
DEPENDS ClangSupport CPlusPlus
PLUGIN_DEPENDS Core CppTools TextEditor ClangPchManager

4
src/plugins/plugins.pro
View File

@@ -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
}

4
src/shared/clang/clang_installation.pri
View File

@@ -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
}

4
src/tools/tools.pro
View File

@@ -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
}