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

Fix clangrefactoring disabling logic

Browse Source 
* Disable only for MSVC which is < 2015 update 3
* Fix isEmpty test

Change-Id: I35b396f547d3a1e78713797266ede9f8fbbb9f72
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Orgad Shaneh
2016-12-09 11:38:41 +02:00
committed by Orgad Shaneh
parent 6bf4157491
commit 6a1ead7abb
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/plugins.pro
View File

@@ -77,15 +77,13 @@ 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) { win32-msvc2015:lessThan(QT_CL_PATCH_VERSION, 24210): QTC_NO_CLANG_LIBTOOLING = 1
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.")

6
src/tools/tools.pro
View File

@@ -22,15 +22,13 @@ 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) { win32-msvc2015:lessThan(QT_CL_PATCH_VERSION, 24210): QTC_NO_CLANG_LIBTOOLING = 1
isEmpty(QTC_NO_CLANG_LIBTOOLING) {
SUBDIRS += clangrefactoringbackend SUBDIRS += clangrefactoringbackend
} else { } else {
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)