diff options
| -rw-r--r-- | qbs/modules/libclang/libclang.qbs | 4 | ||||
| -rw-r--r-- | src/plugins/plugins.pro | 4 | ||||
| -rw-r--r-- | src/shared/clang/clang_installation.pri | 15 | ||||
| -rw-r--r-- | src/tools/tools.pro | 4 |
4 files changed, 10 insertions, 17 deletions
diff --git a/qbs/modules/libclang/libclang.qbs b/qbs/modules/libclang/libclang.qbs index bb427bc4f8a..b13ba888ffd 100644 --- a/qbs/modules/libclang/libclang.qbs +++ b/qbs/modules/libclang/libclang.qbs @@ -55,9 +55,7 @@ Module { return incl != llvmIncludeDir; }) property stringList llvmToolingCxxFlags: clangProbe.llvmToolingCxxFlags - property bool toolingEnabled: !Environment.getEnv("QTC_NO_CLANG_LIBTOOLING") - && Utilities.versionCompare(llvmVersion, "6") > 0 - && Utilities.versionCompare(llvmVersion, "7") < 0 + property bool toolingEnabled: Environment.getEnv("QTC_ENABLE_CLANG_LIBTOOLING") validate: { if (!clangProbe.found) { diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 5d8b676a207..a540713d7aa 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -105,8 +105,8 @@ exists(../shared/qbs/qbs.pro)|!isEmpty(QBS_INSTALL_DIR): \ SUBDIRS += \ clangcodemodel -QTC_NO_CLANG_LIBTOOLING=$$(QTC_NO_CLANG_LIBTOOLING) -isEmpty(QTC_NO_CLANG_LIBTOOLING) { +QTC_ENABLE_CLANG_LIBTOOLING=$$(QTC_ENABLE_CLANG_LIBTOOLING) +!isEmpty(QTC_ENABLE_CLANG_LIBTOOLING) { SUBDIRS += clangrefactoring SUBDIRS += clangpchmanager } else { diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri index eecc003d8ad..cb9478f0acf 100644 --- a/src/shared/clang/clang_installation.pri +++ b/src/shared/clang/clang_installation.pri @@ -148,17 +148,12 @@ isEmpty(LLVM_VERSION) { !contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): LIBCLANG_LIBS = -L$${LLVM_LIBDIR} LIBCLANG_LIBS += $${CLANG_LIB} - QTC_NO_CLANG_LIBTOOLING=$$(QTC_NO_CLANG_LIBTOOLING) - isEmpty(QTC_NO_CLANG_LIBTOOLING) { - QTC_FORCE_CLANG_LIBTOOLING = $$(QTC_FORCE_CLANG_LIBTOOLING) - versionIsEqual($$LLVM_VERSION, 6, 0)|!isEmpty(QTC_FORCE_CLANG_LIBTOOLING) { - !contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): LIBTOOLING_LIBS = -L$${LLVM_LIBDIR} - LIBTOOLING_LIBS += $$CLANGTOOLING_LIBS $$LLVM_STATIC_LIBS - } else { - warning("Clang LibTooling is disabled because only version 6.0 is supported.") - } + QTC_ENABLE_CLANG_LIBTOOLING=$$(QTC_ENABLE_CLANG_LIBTOOLING) + !isEmpty(QTC_ENABLE_CLANG_LIBTOOLING) { + !contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): LIBTOOLING_LIBS = -L$${LLVM_LIBDIR} + LIBTOOLING_LIBS += $$CLANGTOOLING_LIBS $$LLVM_STATIC_LIBS } else { - warning("Clang LibTooling is disabled.") + warning("Clang LibTooling is disabled. Set QTC_ENABLE_CLANG_LIBTOOLING to enable it.") } contains(QMAKE_DEFAULT_INCDIRS, $$LLVM_INCLUDEPATH): LLVM_INCLUDEPATH = diff --git a/src/tools/tools.pro b/src/tools/tools.pro index cce61a59a7f..07246b95fe4 100644 --- a/src/tools/tools.pro +++ b/src/tools/tools.pro @@ -23,8 +23,8 @@ mac { SUBDIRS += clangbackend -QTC_NO_CLANG_LIBTOOLING=$$(QTC_NO_CLANG_LIBTOOLING) -isEmpty(QTC_NO_CLANG_LIBTOOLING) { +QTC_ENABLE_CLANG_LIBTOOLING=$$(QTC_ENABLE_CLANG_LIBTOOLING) +!isEmpty(QTC_ENABLE_CLANG_LIBTOOLING) { SUBDIRS += clangrefactoringbackend SUBDIRS += clangpchmanagerbackend } else { |