diff --git a/src/plugins/clangpchmanager/clangpchmanager.pro b/src/plugins/clangpchmanager/clangpchmanager.pro index 3792f6d6a3f..a61103d8396 100644 --- a/src/plugins/clangpchmanager/clangpchmanager.pro +++ b/src/plugins/clangpchmanager/clangpchmanager.pro @@ -3,6 +3,8 @@ include(clangpchmanager-source.pri) include(../../shared/clang/clang_installation.pri) include(../../shared/clang/clang_defines.pri) +requires(!isEmpty(LIBTOOLING_LIBS)) + HEADERS += \ $$PWD/clangpchmanagerplugin.h \ qtcreatorprojectupdater.h diff --git a/src/plugins/clangrefactoring/clangrefactoring.pro b/src/plugins/clangrefactoring/clangrefactoring.pro index 838e2da1b82..42efebd56a1 100644 --- a/src/plugins/clangrefactoring/clangrefactoring.pro +++ b/src/plugins/clangrefactoring/clangrefactoring.pro @@ -4,6 +4,8 @@ include(../../shared/clang/clang_installation.pri) include(../../shared/clang/clang_defines.pri) +requires(!isEmpty(LIBTOOLING_LIBS)) + HEADERS += \ $$PWD/clangrefactoringplugin.h \ qtcreatorsearch.h \ diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index fa872bb39f0..d1c774128bb 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -101,8 +101,8 @@ isEmpty(LLVM_INSTALL_DIR):LLVM_INSTALL_DIR=$$(LLVM_INSTALL_DIR) exists($$LLVM_INSTALL_DIR) { SUBDIRS += clangcodemodel - LIBTOOLING_LIBS=$$(LIBTOOLING_LIBS) - !isEmpty(LIBTOOLING_LIBS) { + QTC_NO_CLANG_LIBTOOLING=$$(QTC_NO_CLANG_LIBTOOLING) + isEmpty(QTC_NO_CLANG_LIBTOOLING) { SUBDIRS += clangrefactoring SUBDIRS += clangpchmanager } else { diff --git a/src/tools/clangpchmanagerbackend/clangpchmanagerbackend.pro b/src/tools/clangpchmanagerbackend/clangpchmanagerbackend.pro index 662979c0e22..b115782dfe7 100644 --- a/src/tools/clangpchmanagerbackend/clangpchmanagerbackend.pro +++ b/src/tools/clangpchmanagerbackend/clangpchmanagerbackend.pro @@ -5,6 +5,8 @@ include(../../qtcreatortool.pri) include(../../shared/clang/clang_installation.pri) include(source/clangpchmanagerbackend-source.pri) +requires(!isEmpty(LIBTOOLING_LIBS)) + win32 { LLVM_BUILDMODE = $$system($$llvm_config --build-mode, lines) CONFIG(debug, debug|release):requires(equals(LLVM_BUILDMODE, "Debug")) diff --git a/src/tools/clangrefactoringbackend/clangrefactoringbackend.pro b/src/tools/clangrefactoringbackend/clangrefactoringbackend.pro index 518e203a4a4..705198f216e 100644 --- a/src/tools/clangrefactoringbackend/clangrefactoringbackend.pro +++ b/src/tools/clangrefactoringbackend/clangrefactoringbackend.pro @@ -5,6 +5,8 @@ include(../../qtcreatortool.pri) include(../../shared/clang/clang_installation.pri) include(source/clangrefactoringbackend-source.pri) +requires(!isEmpty(LIBTOOLING_LIBS)) + win32 { LLVM_BUILDMODE = $$system($$llvm_config --build-mode, lines) CONFIG(debug, debug|release):requires(equals(LLVM_BUILDMODE, "Debug")) diff --git a/src/tools/tools.pro b/src/tools/tools.pro index 2e62f31b2c4..cfe34abaa0a 100644 --- a/src/tools/tools.pro +++ b/src/tools/tools.pro @@ -24,8 +24,8 @@ isEmpty(LLVM_INSTALL_DIR):LLVM_INSTALL_DIR=$$(LLVM_INSTALL_DIR) exists($$LLVM_INSTALL_DIR) { SUBDIRS += clangbackend - LIBTOOLING_LIBS=$$(LIBTOOLING_LIBS) - !isEmpty(LIBTOOLING_LIBS) { + QTC_NO_CLANG_LIBTOOLING=$$(QTC_NO_CLANG_LIBTOOLING) + isEmpty(QTC_NO_CLANG_LIBTOOLING) { SUBDIRS += clangrefactoringbackend SUBDIRS += clangpchmanagerbackend } else {