From 9a4f0317c13170d6a89f12221643f6c945e8a254 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Wed, 20 Jun 2018 10:18:50 +0200
Subject: Clang: only build with LibTooling if explicitly enabled

The feature is experimental and should not be used, yet.

Change-Id: Ifb9a651dcbaade5801ac28f900030407f12dc844
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
---
 qbs/modules/libclang/libclang.qbs       |  4 +---
 src/plugins/plugins.pro                 |  4 ++--
 src/shared/clang/clang_installation.pri | 15 +++++----------
 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 bb427bc4f8..b13ba888ff 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 5d8b676a20..a540713d7a 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 eecc003d8a..cb9478f0ac 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 cce61a59a7..07246b95fe 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 {
-- 
cgit v1.2.3