diff -rupN --no-dereference qt-creator-opensource-src-4.13.0/src/shared/clang/clang_installation.pri qt-creator-opensource-src-4.13.0-new/src/shared/clang/clang_installation.pri
--- qt-creator-opensource-src-4.13.0/src/shared/clang/clang_installation.pri	2020-08-25 13:26:23.000000000 +0200
+++ qt-creator-opensource-src-4.13.0-new/src/shared/clang/clang_installation.pri	2020-08-26 16:08:58.540504692 +0200
@@ -131,9 +131,7 @@ defineReplace(extractWarnings) {
     return($$result)
 }
 
-CLANGTOOLING_LIBS=-lclangTooling -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \
-                  -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \
-                  -lclangASTMatchers -lclangToolingCore -lclangAST -lclangLex -lclangBasic
+CLANGTOOLING_LIBS=-lclang-cpp
 win32:CLANGTOOLING_LIBS += -lversion
 
 BIN_EXTENSION =
@@ -209,11 +207,8 @@ isEmpty(LLVM_VERSION) {
     isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) {
         CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h
         exists($$CLANGFORMAT_MAIN_HEADER) {
-            CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
-            ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \
-                           -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \
-                           -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \
-                           -lclangASTMatchers -lclangAST -lclangLex -lclangBasic
+            CLANGFORMAT_LIBS=-lclang-cpp
+            ALL_CLANG_LIBS=-lclang-cpp
             win32:CLANGFORMAT_LIBS += -lversion
         }
     }
diff -rupN --no-dereference qt-creator-opensource-src-4.13.0/src/tools/clangrefactoringbackend/source/CMakeLists.txt qt-creator-opensource-src-4.13.0-new/src/tools/clangrefactoringbackend/source/CMakeLists.txt
--- qt-creator-opensource-src-4.13.0/src/tools/clangrefactoringbackend/source/CMakeLists.txt	2020-08-25 13:26:24.000000000 +0200
+++ qt-creator-opensource-src-4.13.0-new/src/tools/clangrefactoringbackend/source/CMakeLists.txt	2020-08-26 16:08:58.540504692 +0200
@@ -1,11 +1,7 @@
 add_qtc_library(clangrefactoringbackend_lib STATIC
   PUBLIC_DEPENDS
     Threads::Threads
-    LLVMCore libclang
-    clangAST clangASTMatchers clangBasic clangDynamicASTMatchers clangFrontend
-    clangHandleCXX clangIndex clangLex
-    clangSerialization clangTooling clangQuery
-    ClangSupport
+    LLVMCore libclang clang-cpp
   PUBLIC_DEFINES CLANGSUPPORT_BUILD_LIB
   PUBLIC_INCLUDES
     ${CLANG_INCLUDE_DIRS}