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

Clang: Temporary workaround for VS 2015 Update 2

Browse Source 
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 <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Marco Bubke
2016-12-08 15:35:08 +01:00
committed by Eike Ziller
parent 654a48b19d
commit ce7e5e3b4d
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/plugins.pro
View File

@@ -77,12 +77,15 @@ isEmpty(LLVM_INSTALL_DIR):LLVM_INSTALL_DIR=$$(LLVM_INSTALL_DIR)
exists($$LLVM_INSTALL_DIR) { exists($$LLVM_INSTALL_DIR) {
SUBDIRS += clangcodemodel 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) QTC_NO_CLANG_LIBTOOLING=$$(QTC_NO_CLANG_LIBTOOLING)
isEmpty($$QTC_NO_CLANG_LIBTOOLING) { isEmpty($$QTC_NO_CLANG_LIBTOOLING) {
SUBDIRS += clangrefactoring SUBDIRS += clangrefactoring
} else { } else {
warning("Building the Clang refactoring plugin is disabled.") warning("Building the Clang refactoring plugin is disabled.")
} }
}
} else { } else {
warning("Set LLVM_INSTALL_DIR to build the Clang Code Model. " \ warning("Set LLVM_INSTALL_DIR to build the Clang Code Model. " \
"For details, see doc/src/editors/creator-clang-codemodel.qdoc.") "For details, see doc/src/editors/creator-clang-codemodel.qdoc.")

3
src/tools/tools.pro
View File

@@ -22,6 +22,8 @@ isEmpty(LLVM_INSTALL_DIR):LLVM_INSTALL_DIR=$$(LLVM_INSTALL_DIR)
exists($$LLVM_INSTALL_DIR) { exists($$LLVM_INSTALL_DIR) {
SUBDIRS += clangbackend 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) QTC_NO_CLANG_LIBTOOLING=$$(QTC_NO_CLANG_LIBTOOLING)
!isEmpty($$QTC_NO_CLANG_LIBTOOLING) { !isEmpty($$QTC_NO_CLANG_LIBTOOLING) {
SUBDIRS += clangrefactoringbackend SUBDIRS += clangrefactoringbackend
@@ -29,6 +31,7 @@ exists($$LLVM_INSTALL_DIR) {
warning("Building the Clang refactoring back end is disabled.") warning("Building the Clang refactoring back end is disabled.")
} }
} }
}
isEmpty(BUILD_CPLUSPLUS_TOOLS):BUILD_CPLUSPLUS_TOOLS=$$(BUILD_CPLUSPLUS_TOOLS) isEmpty(BUILD_CPLUSPLUS_TOOLS):BUILD_CPLUSPLUS_TOOLS=$$(BUILD_CPLUSPLUS_TOOLS)
!isEmpty(BUILD_CPLUSPLUS_TOOLS) { !isEmpty(BUILD_CPLUSPLUS_TOOLS) {