From ce7e5e3b4dca623763e2d930ce9fff7383c2150b Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Thu, 8 Dec 2016 15:35:08 +0100 Subject: [PATCH] Clang: Temporary workaround for VS 2015 Update 2 We disable older Visual Studio compilers because they have bugs. This patch has to be reverted after we go to VS 2015 Update 3. Change-Id: I2c6eecab993282b24003ceb99a991a72502057f6 Reviewed-by: Alessandro Portale Reviewed-by: Eike Ziller --- src/plugins/plugins.pro | 3 +++ src/tools/tools.pro | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 0980a4c49a1..a7dcbeaff05 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -77,12 +77,15 @@ isEmpty(LLVM_INSTALL_DIR):LLVM_INSTALL_DIR=$$(LLVM_INSTALL_DIR) exists($$LLVM_INSTALL_DIR) { SUBDIRS += clangcodemodel + win32-msvc*:equals(QT_CL_MAJOR_VERSION, 19):equals(QT_CL_MINOR_VERSION, 00): \ + greaterThan(QT_CL_PATCH_VERSION, 24209) { QTC_NO_CLANG_LIBTOOLING=$$(QTC_NO_CLANG_LIBTOOLING) isEmpty($$QTC_NO_CLANG_LIBTOOLING) { SUBDIRS += clangrefactoring } else { warning("Building the Clang refactoring plugin is disabled.") } + } } else { warning("Set LLVM_INSTALL_DIR to build the Clang Code Model. " \ "For details, see doc/src/editors/creator-clang-codemodel.qdoc.") diff --git a/src/tools/tools.pro b/src/tools/tools.pro index c15f2148076..53fd09a532f 100644 --- a/src/tools/tools.pro +++ b/src/tools/tools.pro @@ -22,12 +22,15 @@ isEmpty(LLVM_INSTALL_DIR):LLVM_INSTALL_DIR=$$(LLVM_INSTALL_DIR) exists($$LLVM_INSTALL_DIR) { SUBDIRS += clangbackend + win32-msvc*:equals(QT_CL_MAJOR_VERSION, 19):equals(QT_CL_MINOR_VERSION, 00): \ + greaterThan(QT_CL_PATCH_VERSION, 24209) { QTC_NO_CLANG_LIBTOOLING=$$(QTC_NO_CLANG_LIBTOOLING) !isEmpty($$QTC_NO_CLANG_LIBTOOLING) { SUBDIRS += clangrefactoringbackend } else { warning("Building the Clang refactoring back end is disabled.") } + } } isEmpty(BUILD_CPLUSPLUS_TOOLS):BUILD_CPLUSPLUS_TOOLS=$$(BUILD_CPLUSPLUS_TOOLS)