diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index a7dcbeaff05..8090973537c 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.")
diff --git a/src/tools/tools.pro b/src/tools/tools.pro
index 53fd09a532f..25506b7282d 100644
--- a/src/tools/tools.pro
+++ b/src/tools/tools.pro
@@ -22,15 +22,13 @@ 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) {
+    win32-msvc2015:lessThan(QT_CL_PATCH_VERSION, 24210): QTC_NO_CLANG_LIBTOOLING = 1
+    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)