diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2016-12-09 11:38:41 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2016-12-12 10:34:46 +0000 |
| commit | 6a1ead7abb409a97aa8cd4d38adce8df2972ed51 (patch) | |
| tree | 872095acd94e81c1c312b8b93394890f63addd36 /src/plugins/plugins.pro | |
| parent | 6bf41574914e9e0720a99971ec5110d2a4854e32 (diff) | |
| download | qt-creator-6a1ead7abb409a97aa8cd4d38adce8df2972ed51.tar.gz | |
Fix clangrefactoring disabling logic
* 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>
Diffstat (limited to 'src/plugins/plugins.pro')
| -rw-r--r-- | src/plugins/plugins.pro | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index a7dcbeaff0..8090973537 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -77,15 +77,13 @@ 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) { + win32-msvc2015:lessThan(QT_CL_PATCH_VERSION, 24210): QTC_NO_CLANG_LIBTOOLING = 1 + 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.") |