Clang: Rename library clangbackendipc to clangsupport

We already share same classes there which has nothing to do with IPC and I want to more for sharing. So we should use a name which fits better. Change-Id: Idfb12b6de714206117b92634ad719c6a0e290e78 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
author: Marco Bubke <marco.bubke@qt.io> 2017-08-24 12:28:01 +0200
committer: Marco Bubke <marco.bubke@qt.io> 2017-08-29 16:36:35 +0000
commit: 7c0331ab93ff6096a2b7742688e171ddc99ed269 (patch)
tree: bed9561852d24f84fc734bc2bc4d11e76ecd4a31
parent: 46ba29b8c05e05af355caed68f0988f9fbd8a8d0 (diff)
download: qt-creator-7c0331ab93ff6096a2b7742688e171ddc99ed269.tar.gz
229 files changed, 143 insertions, 143 deletions
diff --git a/src/libs/clangbackendipc/clangbackendipc_dependencies.pri b/src/libs/clangbackendipc/clangbackendipc_dependencies.pri
deleted file mode 100644
index 3b52d130c3..0000000000
--- a/src/libs/clangbackendipc/clangbackendipc_dependencies.pri
+++ /dev/null
@@ -1,3 +0,0 @@
-QTC_LIB_NAME = Clangbackendipc
-QTC_LIB_DEPENDS += sqlite utils
-INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/clangbackendipc
diff --git a/src/libs/clangbackendipc/cancelmessage.cpp b/src/libs/clangsupport/cancelmessage.cpp
index ca5adf0ab4..ca5adf0ab4 100644
--- a/src/libs/clangbackendipc/cancelmessage.cpp
+++ b/src/libs/clangsupport/cancelmessage.cpp
diff --git a/src/libs/clangbackendipc/cancelmessage.h b/src/libs/clangsupport/cancelmessage.h
index c8924faec6..151799c3ab 100644
--- a/src/libs/clangbackendipc/cancelmessage.h
+++ b/src/libs/clangsupport/cancelmessage.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 
 namespace ClangBackEnd {
 
diff --git a/src/libs/clangbackendipc/clangcodemodelclientinterface.cpp b/src/libs/clangsupport/clangcodemodelclientinterface.cpp
index 77bd1a589e..77bd1a589e 100644
--- a/src/libs/clangbackendipc/clangcodemodelclientinterface.cpp
+++ b/src/libs/clangsupport/clangcodemodelclientinterface.cpp
diff --git a/src/libs/clangbackendipc/clangcodemodelclientinterface.h b/src/libs/clangsupport/clangcodemodelclientinterface.h
index 04682ff483..04682ff483 100644
--- a/src/libs/clangbackendipc/clangcodemodelclientinterface.h
+++ b/src/libs/clangsupport/clangcodemodelclientinterface.h
diff --git a/src/libs/clangbackendipc/clangcodemodelclientmessages.h b/src/libs/clangsupport/clangcodemodelclientmessages.h
index 99f9a41c05..99f9a41c05 100644
--- a/src/libs/clangbackendipc/clangcodemodelclientmessages.h
+++ b/src/libs/clangsupport/clangcodemodelclientmessages.h
diff --git a/src/libs/clangbackendipc/clangcodemodelclientproxy.cpp b/src/libs/clangsupport/clangcodemodelclientproxy.cpp
index b9ec51cac9..b9ec51cac9 100644
--- a/src/libs/clangbackendipc/clangcodemodelclientproxy.cpp
+++ b/src/libs/clangsupport/clangcodemodelclientproxy.cpp
diff --git a/src/libs/clangbackendipc/clangcodemodelclientproxy.h b/src/libs/clangsupport/clangcodemodelclientproxy.h
index 9c2c58c6eb..a86321888d 100644
--- a/src/libs/clangbackendipc/clangcodemodelclientproxy.h
+++ b/src/libs/clangsupport/clangcodemodelclientproxy.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 #include "clangcodemodelclientinterface.h"
 #include "readmessageblock.h"
 #include "writemessageblock.h"
diff --git a/src/libs/clangbackendipc/clangcodemodelconnectionclient.cpp b/src/libs/clangsupport/clangcodemodelconnectionclient.cpp
index 254f650f22..254f650f22 100644
--- a/src/libs/clangbackendipc/clangcodemodelconnectionclient.cpp
+++ b/src/libs/clangsupport/clangcodemodelconnectionclient.cpp
diff --git a/src/libs/clangbackendipc/clangcodemodelconnectionclient.h b/src/libs/clangsupport/clangcodemodelconnectionclient.h
index 4069d654bd..4069d654bd 100644
--- a/src/libs/clangbackendipc/clangcodemodelconnectionclient.h
+++ b/src/libs/clangsupport/clangcodemodelconnectionclient.h
diff --git a/src/libs/clangbackendipc/clangcodemodelserverinterface.cpp b/src/libs/clangsupport/clangcodemodelserverinterface.cpp
index bdaa802a47..bdaa802a47 100644
--- a/src/libs/clangbackendipc/clangcodemodelserverinterface.cpp
+++ b/src/libs/clangsupport/clangcodemodelserverinterface.cpp
diff --git a/src/libs/clangbackendipc/clangcodemodelserverinterface.h b/src/libs/clangsupport/clangcodemodelserverinterface.h
index e5b2956edd..e5b2956edd 100644
--- a/src/libs/clangbackendipc/clangcodemodelserverinterface.h
+++ b/src/libs/clangsupport/clangcodemodelserverinterface.h
diff --git a/src/libs/clangbackendipc/clangcodemodelservermessages.h b/src/libs/clangsupport/clangcodemodelservermessages.h
index b1ba7a0701..b1ba7a0701 100644
--- a/src/libs/clangbackendipc/clangcodemodelservermessages.h
+++ b/src/libs/clangsupport/clangcodemodelservermessages.h
diff --git a/src/libs/clangbackendipc/clangcodemodelserverproxy.cpp b/src/libs/clangsupport/clangcodemodelserverproxy.cpp
index a5b6411e75..a5b6411e75 100644
--- a/src/libs/clangbackendipc/clangcodemodelserverproxy.cpp
+++ b/src/libs/clangsupport/clangcodemodelserverproxy.cpp
diff --git a/src/libs/clangbackendipc/clangcodemodelserverproxy.h b/src/libs/clangsupport/clangcodemodelserverproxy.h
index c43c9cd01d..c43c9cd01d 100644
--- a/src/libs/clangbackendipc/clangcodemodelserverproxy.h
+++ b/src/libs/clangsupport/clangcodemodelserverproxy.h
diff --git a/src/libs/clangbackendipc/clangrefactoringclientmessages.h b/src/libs/clangsupport/clangrefactoringclientmessages.h
index 7b90453540..7b90453540 100644
--- a/src/libs/clangbackendipc/clangrefactoringclientmessages.h
+++ b/src/libs/clangsupport/clangrefactoringclientmessages.h
diff --git a/src/libs/clangbackendipc/clangrefactoringmessages.h b/src/libs/clangsupport/clangrefactoringmessages.h
index 7f6f0de69e..7f6f0de69e 100644
--- a/src/libs/clangbackendipc/clangrefactoringmessages.h
+++ b/src/libs/clangsupport/clangrefactoringmessages.h
diff --git a/src/libs/clangbackendipc/clangrefactoringservermessages.h b/src/libs/clangsupport/clangrefactoringservermessages.h
index 797b3d58ef..797b3d58ef 100644
--- a/src/libs/clangbackendipc/clangrefactoringservermessages.h
+++ b/src/libs/clangsupport/clangrefactoringservermessages.h
diff --git a/src/libs/clangbackendipc/clangbackendipc-lib.pri b/src/libs/clangsupport/clangsupport-lib.pri
index 1716bfe9e1..1c18e89870 100644
--- a/src/libs/clangbackendipc/clangbackendipc-lib.pri
+++ b/src/libs/clangsupport/clangsupport-lib.pri
@@ -1,7 +1,7 @@
 shared {
-    DEFINES += CLANGBACKENDIPC_BUILD_LIB
+    DEFINES += CLANGSUPPORT_BUILD_LIB
 } else {
-    DEFINES += CLANGBACKENDIPC_BUILD_STATIC_LIB
+    DEFINES += CLANGSUPPORT_BUILD_STATIC_LIB
 }
 
 QT += network
@@ -10,7 +10,7 @@ INCLUDEPATH += $$PWD
 
 SOURCES += \
     $$PWD/cancelmessage.cpp \
-    $$PWD/clangbackendipcdebugutils.cpp \
+    $$PWD/clangsupportdebugutils.cpp \
     $$PWD/clangcodemodelclientinterface.cpp \
     $$PWD/clangcodemodelclientproxy.cpp \
     $$PWD/clangcodemodelconnectionclient.cpp \
@@ -88,8 +88,8 @@ SOURCES += \
 
 HEADERS += \
     $$PWD/cancelmessage.h \
-    $$PWD/clangbackendipcdebugutils.h \
-    $$PWD/clangbackendipc_global.h \
+    $$PWD/clangsupportdebugutils.h \
+    $$PWD/clangsupport_global.h \
     $$PWD/clangcodemodelclientinterface.h \
     $$PWD/clangcodemodelclientmessages.h \
     $$PWD/clangcodemodelclientproxy.h \
diff --git a/src/libs/clangbackendipc/clangbackendipc.pro b/src/libs/clangsupport/clangsupport.pro
index e5997d0688..fa614e74ff 100644
--- a/src/libs/clangbackendipc/clangbackendipc.pro
+++ b/src/libs/clangsupport/clangsupport.pro
@@ -1,2 +1,2 @@
 include(../../qtcreatorlibrary.pri)
-include(clangbackendipc-lib.pri)
+include(clangsupport-lib.pri)
diff --git a/src/libs/clangbackendipc/clangbackendipc.qbs b/src/libs/clangsupport/clangsupport.qbs
index afa80a5e2b..6b76f784af 100644
--- a/src/libs/clangbackendipc/clangbackendipc.qbs
+++ b/src/libs/clangsupport/clangsupport.qbs
@@ -1,14 +1,14 @@
 import qbs 1.0
 
 QtcLibrary {
-    name: "ClangBackEndIpc"
+    name: "ClangSupport"
     targetName: "Clangbackendipc"
 
     Depends { name: "Qt.network" }
     Depends { name: "Sqlite" }
     Depends { name: "Utils" }
 
-    cpp.defines: base.concat("CLANGBACKENDIPC_BUILD_LIB")
+    cpp.defines: base.concat("CLANGSUPPORT_BUILD_LIB")
     cpp.includePaths: base.concat(".")
 
     Group {
diff --git a/src/libs/clangsupport/clangsupport_dependencies.pri b/src/libs/clangsupport/clangsupport_dependencies.pri
new file mode 100644
index 0000000000..74afbf09a8
--- /dev/null
+++ b/src/libs/clangsupport/clangsupport_dependencies.pri
@@ -0,0 +1,3 @@
+QTC_LIB_NAME = Clangsupport
+QTC_LIB_DEPENDS += sqlite utils
+INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/clangsupport
diff --git a/src/libs/clangbackendipc/clangbackendipc_global.h b/src/libs/clangsupport/clangsupport_global.h
index ec22645db5..18e15f52ea 100644
--- a/src/libs/clangbackendipc/clangbackendipc_global.h
+++ b/src/libs/clangsupport/clangsupport_global.h
@@ -35,9 +35,9 @@
 #include <gtest/gtest.h>
 #endif
 
-#if defined(CLANGBACKENDIPC_BUILD_LIB)
+#if defined(CLANGSUPPORT_BUILD_LIB)
 #  define CMBIPC_EXPORT Q_DECL_EXPORT
-#elif defined(CLANGBACKENDIPC_BUILD_STATIC_LIB)
+#elif defined(CLANGSUPPORT_BUILD_STATIC_LIB)
 #  define CMBIPC_EXPORT
 #else
 #  define CMBIPC_EXPORT Q_DECL_IMPORT
diff --git a/src/libs/clangbackendipc/clangbackendipcdebugutils.cpp b/src/libs/clangsupport/clangsupportdebugutils.cpp
index 8c0f83e10b..c62ad0bbc1 100644
--- a/src/libs/clangbackendipc/clangbackendipcdebugutils.cpp
+++ b/src/libs/clangsupport/clangsupportdebugutils.cpp
@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 
-#include "clangbackendipcdebugutils.h"
+#include "clangsupportdebugutils.h"
 
 #include "filecontainer.h"
 
@@ -43,7 +43,7 @@ class DebugInspectionDir : public QTemporaryDir
 {
 public:
     DebugInspectionDir()
-        : QTemporaryDir(QDir::tempPath() + QLatin1String("/qtc-clangbackendipc-XXXXXX"))
+        : QTemporaryDir(QDir::tempPath() + QLatin1String("/qtc-clangsupport-XXXXXX"))
     {
         setAutoRemove(false); // Keep around for later inspection.
     }
diff --git a/src/libs/clangbackendipc/clangbackendipcdebugutils.h b/src/libs/clangsupport/clangsupportdebugutils.h
index 7f766c45d5..52352bb315 100644
--- a/src/libs/clangbackendipc/clangbackendipcdebugutils.h
+++ b/src/libs/clangsupport/clangsupportdebugutils.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 
 #include <QElapsedTimer>
 
diff --git a/src/libs/clangbackendipc/cmbalivemessage.cpp b/src/libs/clangsupport/cmbalivemessage.cpp
index d0ec78d632..d0ec78d632 100644
--- a/src/libs/clangbackendipc/cmbalivemessage.cpp
+++ b/src/libs/clangsupport/cmbalivemessage.cpp
diff --git a/src/libs/clangbackendipc/cmbalivemessage.h b/src/libs/clangsupport/cmbalivemessage.h
index 435423a2f0..6093b4b86b 100644
--- a/src/libs/clangbackendipc/cmbalivemessage.h
+++ b/src/libs/clangsupport/cmbalivemessage.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 
 #include <QDataStream>
 
diff --git a/src/libs/clangbackendipc/cmbcodecompletedmessage.cpp b/src/libs/clangsupport/cmbcodecompletedmessage.cpp
index e5667fd04e..e5667fd04e 100644
--- a/src/libs/clangbackendipc/cmbcodecompletedmessage.cpp
+++ b/src/libs/clangsupport/cmbcodecompletedmessage.cpp
diff --git a/src/libs/clangbackendipc/cmbcodecompletedmessage.h b/src/libs/clangsupport/cmbcodecompletedmessage.h
index 1bcac526ca..1bcac526ca 100644
--- a/src/libs/clangbackendipc/cmbcodecompletedmessage.h
+++ b/src/libs/clangsupport/cmbcodecompletedmessage.h
diff --git a/src/libs/clangbackendipc/cmbcompletecodemessage.cpp b/src/libs/clangsupport/cmbcompletecodemessage.cpp
index 3bc968e76d..3bc968e76d 100644
--- a/src/libs/clangbackendipc/cmbcompletecodemessage.cpp
+++ b/src/libs/clangsupport/cmbcompletecodemessage.cpp
diff --git a/src/libs/clangbackendipc/cmbcompletecodemessage.h b/src/libs/clangsupport/cmbcompletecodemessage.h
index 1c37a6538b..94a4d300eb 100644
--- a/src/libs/clangbackendipc/cmbcompletecodemessage.h
+++ b/src/libs/clangsupport/cmbcompletecodemessage.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 
 #include <utf8string.h>
 
diff --git a/src/libs/clangbackendipc/cmbechomessage.cpp b/src/libs/clangsupport/cmbechomessage.cpp
index 734eb0d103..734eb0d103 100644
--- a/src/libs/clangbackendipc/cmbechomessage.cpp
+++ b/src/libs/clangsupport/cmbechomessage.cpp
diff --git a/src/libs/clangbackendipc/cmbechomessage.h b/src/libs/clangsupport/cmbechomessage.h
index 098d75f240..7e75a35e3a 100644
--- a/src/libs/clangbackendipc/cmbechomessage.h
+++ b/src/libs/clangsupport/cmbechomessage.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 
 #include "messageenvelop.h"
 
diff --git a/src/libs/clangbackendipc/cmbendmessage.cpp b/src/libs/clangsupport/cmbendmessage.cpp
index d4535f45fa..d4535f45fa 100644
--- a/src/libs/clangbackendipc/cmbendmessage.cpp
+++ b/src/libs/clangsupport/cmbendmessage.cpp
diff --git a/src/libs/clangbackendipc/cmbendmessage.h b/src/libs/clangsupport/cmbendmessage.h
index 684e5b7a7d..40db9ef51f 100644
--- a/src/libs/clangbackendipc/cmbendmessage.h
+++ b/src/libs/clangsupport/cmbendmessage.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 
 #include <QDataStream>
 
diff --git a/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.cpp b/src/libs/clangsupport/cmbregisterprojectsforeditormessage.cpp
index c18cf08980..c18cf08980 100644
--- a/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.cpp
+++ b/src/libs/clangsupport/cmbregisterprojectsforeditormessage.cpp
diff --git a/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.h b/src/libs/clangsupport/cmbregisterprojectsforeditormessage.h
index 10880735f7..10880735f7 100644
--- a/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.h
+++ b/src/libs/clangsupport/cmbregisterprojectsforeditormessage.h
diff --git a/src/libs/clangbackendipc/cmbregistertranslationunitsforeditormessage.cpp b/src/libs/clangsupport/cmbregistertranslationunitsforeditormessage.cpp
index 3b3d3e5e28..3b3d3e5e28 100644
--- a/src/libs/clangbackendipc/cmbregistertranslationunitsforeditormessage.cpp
+++ b/src/libs/clangsupport/cmbregistertranslationunitsforeditormessage.cpp
diff --git a/src/libs/clangbackendipc/cmbregistertranslationunitsforeditormessage.h b/src/libs/clangsupport/cmbregistertranslationunitsforeditormessage.h
index 85afdf63f9..85afdf63f9 100644
--- a/src/libs/clangbackendipc/cmbregistertranslationunitsforeditormessage.h
+++ b/src/libs/clangsupport/cmbregistertranslationunitsforeditormessage.h
diff --git a/src/libs/clangbackendipc/cmbunregisterprojectsforeditormessage.cpp b/src/libs/clangsupport/cmbunregisterprojectsforeditormessage.cpp
index e509926970..e509926970 100644
--- a/src/libs/clangbackendipc/cmbunregisterprojectsforeditormessage.cpp
+++ b/src/libs/clangsupport/cmbunregisterprojectsforeditormessage.cpp
diff --git a/src/libs/clangbackendipc/cmbunregisterprojectsforeditormessage.h b/src/libs/clangsupport/cmbunregisterprojectsforeditormessage.h
index 355e85217d..8f1e02f2fe 100644
--- a/src/libs/clangbackendipc/cmbunregisterprojectsforeditormessage.h
+++ b/src/libs/clangsupport/cmbunregisterprojectsforeditormessage.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 
 #include <utf8stringvector.h>
 
diff --git a/src/libs/clangbackendipc/cmbunregistertranslationunitsforeditormessage.cpp b/src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.cpp
index c547b94b2f..c547b94b2f 100644
--- a/src/libs/clangbackendipc/cmbunregistertranslationunitsforeditormessage.cpp
+++ b/src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.cpp
diff --git a/src/libs/clangbackendipc/cmbunregistertranslationunitsforeditormessage.h b/src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.h
index ea9df17d28..aa6bf47edd 100644
--- a/src/libs/clangbackendipc/cmbunregistertranslationunitsforeditormessage.h
+++ b/src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 
 #include "filecontainer.h"
 
diff --git a/src/libs/clangbackendipc/codecompletion.cpp b/src/libs/clangsupport/codecompletion.cpp
index 07b2daac0f..07b2daac0f 100644
--- a/src/libs/clangbackendipc/codecompletion.cpp
+++ b/src/libs/clangsupport/codecompletion.cpp
diff --git a/src/libs/clangbackendipc/codecompletion.h b/src/libs/clangsupport/codecompletion.h
index bd63115da0..78303c1c33 100644
--- a/src/libs/clangbackendipc/codecompletion.h
+++ b/src/libs/clangsupport/codecompletion.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 #include "codecompletionchunk.h"
 
 #include <utf8string.h>
diff --git a/src/libs/clangbackendipc/codecompletionchunk.cpp b/src/libs/clangsupport/codecompletionchunk.cpp
index 60a0fee2c4..60a0fee2c4 100644
--- a/src/libs/clangbackendipc/codecompletionchunk.cpp
+++ b/src/libs/clangsupport/codecompletionchunk.cpp
diff --git a/src/libs/clangbackendipc/codecompletionchunk.h b/src/libs/clangsupport/codecompletionchunk.h
index 8ba1032c8e..57d351afde 100644
--- a/src/libs/clangbackendipc/codecompletionchunk.h
+++ b/src/libs/clangsupport/codecompletionchunk.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 
 #include <utf8string.h>
 
diff --git a/src/libs/clangbackendipc/connectionclient.cpp b/src/libs/clangsupport/connectionclient.cpp
index c0a0fa5de5..e53fac1810 100644
--- a/src/libs/clangbackendipc/connectionclient.cpp
+++ b/src/libs/clangsupport/connectionclient.cpp
@@ -25,7 +25,7 @@
 
 #include "connectionclient.h"
 
-#include "clangbackendipcdebugutils.h"
+#include "clangsupportdebugutils.h"
 
 #include <QCoreApplication>
 #include <QMetaMethod>
diff --git a/src/libs/clangbackendipc/connectionclient.h b/src/libs/clangsupport/connectionclient.h
index d8c6692b56..d8c6692b56 100644
--- a/src/libs/clangbackendipc/connectionclient.h
+++ b/src/libs/clangsupport/connectionclient.h
diff --git a/src/libs/clangbackendipc/connectionserver.cpp b/src/libs/clangsupport/connectionserver.cpp
index 6828041de8..6828041de8 100644
--- a/src/libs/clangbackendipc/connectionserver.cpp
+++ b/src/libs/clangsupport/connectionserver.cpp
diff --git a/src/libs/clangbackendipc/connectionserver.h b/src/libs/clangsupport/connectionserver.h
index 021ffac0f9..268c3776a4 100644
--- a/src/libs/clangbackendipc/connectionserver.h
+++ b/src/libs/clangsupport/connectionserver.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 
 #include <QCoreApplication>
 #include <QLocalServer>
diff --git a/src/libs/clangbackendipc/diagnosticcontainer.cpp b/src/libs/clangsupport/diagnosticcontainer.cpp
index b73114d6d0..b73114d6d0 100644
--- a/src/libs/clangbackendipc/diagnosticcontainer.cpp
+++ b/src/libs/clangsupport/diagnosticcontainer.cpp
diff --git a/src/libs/clangbackendipc/diagnosticcontainer.h b/src/libs/clangsupport/diagnosticcontainer.h
index 56f45abee3..56f45abee3 100644
--- a/src/libs/clangbackendipc/diagnosticcontainer.h
+++ b/src/libs/clangsupport/diagnosticcontainer.h
diff --git a/src/libs/clangbackendipc/documentannotationschangedmessage.cpp b/src/libs/clangsupport/documentannotationschangedmessage.cpp
index a9fef59e4a..a9fef59e4a 100644
--- a/src/libs/clangbackendipc/documentannotationschangedmessage.cpp
+++ b/src/libs/clangsupport/documentannotationschangedmessage.cpp
diff --git a/src/libs/clangbackendipc/documentannotationschangedmessage.h b/src/libs/clangsupport/documentannotationschangedmessage.h
index 75b9350cd3..63fbdcd902 100644
--- a/src/libs/clangbackendipc/documentannotationschangedmessage.h
+++ b/src/libs/clangsupport/documentannotationschangedmessage.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 #include "diagnosticcontainer.h"
 #include "filecontainer.h"
 #include "highlightingmarkcontainer.h"
diff --git a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontainer.cpp b/src/libs/clangsupport/dynamicastmatcherdiagnosticcontainer.cpp
index a7e367609a..a7e367609a 100644
--- a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontainer.cpp
+++ b/src/libs/clangsupport/dynamicastmatcherdiagnosticcontainer.cpp
diff --git a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontainer.h b/src/libs/clangsupport/dynamicastmatcherdiagnosticcontainer.h
index 09149ea35d..09149ea35d 100644
--- a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontainer.h
+++ b/src/libs/clangsupport/dynamicastmatcherdiagnosticcontainer.h
diff --git a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontextcontainer.cpp b/src/libs/clangsupport/dynamicastmatcherdiagnosticcontextcontainer.cpp
index 37ce066706..37ce066706 100644
--- a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontextcontainer.cpp
+++ b/src/libs/clangsupport/dynamicastmatcherdiagnosticcontextcontainer.cpp
diff --git a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontextcontainer.h b/src/libs/clangsupport/dynamicastmatcherdiagnosticcontextcontainer.h
index c220aa2377..c220aa2377 100644
--- a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontextcontainer.h
+++ b/src/libs/clangsupport/dynamicastmatcherdiagnosticcontextcontainer.h
diff --git a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticmessagecontainer.cpp b/src/libs/clangsupport/dynamicastmatcherdiagnosticmessagecontainer.cpp
index e17ecd4da9..e17ecd4da9 100644
--- a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticmessagecontainer.cpp
+++ b/src/libs/clangsupport/dynamicastmatcherdiagnosticmessagecontainer.cpp
diff --git a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticmessagecontainer.h b/src/libs/clangsupport/dynamicastmatcherdiagnosticmessagecontainer.h
index 07a21af605..07a21af605 100644
--- a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticmessagecontainer.h
+++ b/src/libs/clangsupport/dynamicastmatcherdiagnosticmessagecontainer.h
diff --git a/src/libs/clangbackendipc/dynamicmatcherdiagnostics.h b/src/libs/clangsupport/dynamicmatcherdiagnostics.h
index 52bcbcb8e5..52bcbcb8e5 100644
--- a/src/libs/clangbackendipc/dynamicmatcherdiagnostics.h
+++ b/src/libs/clangsupport/dynamicmatcherdiagnostics.h
diff --git a/src/libs/clangbackendipc/filecontainer.cpp b/src/libs/clangsupport/filecontainer.cpp
index 9de0b550a3..c3f484dbdf 100644
--- a/src/libs/clangbackendipc/filecontainer.cpp
+++ b/src/libs/clangsupport/filecontainer.cpp
@@ -25,7 +25,7 @@
 
 #include "filecontainer.h"
 
-#include "clangbackendipcdebugutils.h"
+#include "clangsupportdebugutils.h"
 
 #include <QDebug>
 
diff --git a/src/libs/clangbackendipc/filecontainer.h b/src/libs/clangsupport/filecontainer.h
index 5677939694..0a45c491d2 100644
--- a/src/libs/clangbackendipc/filecontainer.h
+++ b/src/libs/clangsupport/filecontainer.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 
 #include <utf8string.h>
 #include <utf8stringvector.h>
diff --git a/src/libs/clangbackendipc/filecontainerv2.cpp b/src/libs/clangsupport/filecontainerv2.cpp
index 57b460d842..57b460d842 100644
--- a/src/libs/clangbackendipc/filecontainerv2.cpp
+++ b/src/libs/clangsupport/filecontainerv2.cpp
diff --git a/src/libs/clangbackendipc/filecontainerv2.h b/src/libs/clangsupport/filecontainerv2.h
index 365bb5283d..7832a43c39 100644
--- a/src/libs/clangbackendipc/filecontainerv2.h
+++ b/src/libs/clangsupport/filecontainerv2.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 #include "filepath.h"
 
 #include <vector>
diff --git a/src/libs/clangbackendipc/filepath.cpp b/src/libs/clangsupport/filepath.cpp
index 0dbb1b4e26..0dbb1b4e26 100644
--- a/src/libs/clangbackendipc/filepath.cpp
+++ b/src/libs/clangsupport/filepath.cpp
diff --git a/src/libs/clangbackendipc/filepath.h b/src/libs/clangsupport/filepath.h
index a29ecf941f..c57da408bc 100644
--- a/src/libs/clangbackendipc/filepath.h
+++ b/src/libs/clangsupport/filepath.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 
 #include <utils/smallstringio.h>
 
diff --git a/src/libs/clangbackendipc/fixitcontainer.cpp b/src/libs/clangsupport/fixitcontainer.cpp
index 05cea43ffc..05cea43ffc 100644
--- a/src/libs/clangbackendipc/fixitcontainer.cpp
+++ b/src/libs/clangsupport/fixitcontainer.cpp
diff --git a/src/libs/clangbackendipc/fixitcontainer.h b/src/libs/clangsupport/fixitcontainer.h
index eac27da02f..eac27da02f 100644
--- a/src/libs/clangbackendipc/fixitcontainer.h
+++ b/src/libs/clangsupport/fixitcontainer.h
diff --git a/src/libs/clangbackendipc/followsymbolmessage.cpp b/src/libs/clangsupport/followsymbolmessage.cpp
index 929199bef5..929199bef5 100644
--- a/src/libs/clangbackendipc/followsymbolmessage.cpp
+++ b/src/libs/clangsupport/followsymbolmessage.cpp
diff --git a/src/libs/clangbackendipc/followsymbolmessage.h b/src/libs/clangsupport/followsymbolmessage.h
index ad8f7348f3..ad8f7348f3 100644
--- a/src/libs/clangbackendipc/followsymbolmessage.h
+++ b/src/libs/clangsupport/followsymbolmessage.h
diff --git a/src/libs/clangbackendipc/highlightingmarkcontainer.cpp b/src/libs/clangsupport/highlightingmarkcontainer.cpp
index ab679c8d89..ab679c8d89 100644
--- a/src/libs/clangbackendipc/highlightingmarkcontainer.cpp
+++ b/src/libs/clangsupport/highlightingmarkcontainer.cpp
diff --git a/src/libs/clangbackendipc/highlightingmarkcontainer.h b/src/libs/clangsupport/highlightingmarkcontainer.h
index 56e998f26c..0bc3ab0b55 100644
--- a/src/libs/clangbackendipc/highlightingmarkcontainer.h
+++ b/src/libs/clangsupport/highlightingmarkcontainer.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 
 #include <QDataStream>
 
diff --git a/src/libs/clangbackendipc/ipcclientinterface.cpp b/src/libs/clangsupport/ipcclientinterface.cpp
index 76f5d81eea..76f5d81eea 100644
--- a/src/libs/clangbackendipc/ipcclientinterface.cpp
+++ b/src/libs/clangsupport/ipcclientinterface.cpp
diff --git a/src/libs/clangbackendipc/ipcclientinterface.h b/src/libs/clangsupport/ipcclientinterface.h
index 080de8a207..080de8a207 100644
--- a/src/libs/clangbackendipc/ipcclientinterface.h
+++ b/src/libs/clangsupport/ipcclientinterface.h
diff --git a/src/libs/clangbackendipc/ipcclientprovider.h b/src/libs/clangsupport/ipcclientprovider.h
index a4bcb7705c..a4bcb7705c 100644
--- a/src/libs/clangbackendipc/ipcclientprovider.h
+++ b/src/libs/clangsupport/ipcclientprovider.h
diff --git a/src/libs/clangbackendipc/ipcinterface.cpp b/src/libs/clangsupport/ipcinterface.cpp
index dc579a49f9..dc579a49f9 100644
--- a/src/libs/clangbackendipc/ipcinterface.cpp
+++ b/src/libs/clangsupport/ipcinterface.cpp
diff --git a/src/libs/clangbackendipc/ipcinterface.h b/src/libs/clangsupport/ipcinterface.h
index f58a7e2a5c..25ebeb650f 100644
--- a/src/libs/clangbackendipc/ipcinterface.h
+++ b/src/libs/clangsupport/ipcinterface.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 
 #include <QtGlobal>
 
diff --git a/src/libs/clangbackendipc/ipcserverinterface.cpp b/src/libs/clangsupport/ipcserverinterface.cpp
index fbc92de52e..fbc92de52e 100644
--- a/src/libs/clangbackendipc/ipcserverinterface.cpp
+++ b/src/libs/clangsupport/ipcserverinterface.cpp
diff --git a/src/libs/clangbackendipc/ipcserverinterface.h b/src/libs/clangsupport/ipcserverinterface.h
index d78176ece0..d78176ece0 100644
--- a/src/libs/clangbackendipc/ipcserverinterface.h
+++ b/src/libs/clangsupport/ipcserverinterface.h
diff --git a/src/libs/clangbackendipc/lineprefixer.cpp b/src/libs/clangsupport/lineprefixer.cpp
index b11f98e7a7..b11f98e7a7 100644
--- a/src/libs/clangbackendipc/lineprefixer.cpp
+++ b/src/libs/clangsupport/lineprefixer.cpp
diff --git a/src/libs/clangbackendipc/lineprefixer.h b/src/libs/clangsupport/lineprefixer.h
index 4e2972319c..de87e4b10d 100644
--- a/src/libs/clangbackendipc/lineprefixer.h
+++ b/src/libs/clangsupport/lineprefixer.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 
 #include <QString>
 #include <QTextStream>
diff --git a/src/libs/clangbackendipc/messageenvelop.cpp b/src/libs/clangsupport/messageenvelop.cpp
index 489806a986..489806a986 100644
--- a/src/libs/clangbackendipc/messageenvelop.cpp
+++ b/src/libs/clangsupport/messageenvelop.cpp
diff --git a/src/libs/clangbackendipc/messageenvelop.h b/src/libs/clangsupport/messageenvelop.h
index 592fdcd7f9..b2dd657620 100644
--- a/src/libs/clangbackendipc/messageenvelop.h
+++ b/src/libs/clangsupport/messageenvelop.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 
 #include <QByteArray>
 #include <QDataStream>
diff --git a/src/libs/clangbackendipc/pchmanagerclientinterface.cpp b/src/libs/clangsupport/pchmanagerclientinterface.cpp
index b7e40f3f5d..b7e40f3f5d 100644
--- a/src/libs/clangbackendipc/pchmanagerclientinterface.cpp
+++ b/src/libs/clangsupport/pchmanagerclientinterface.cpp
diff --git a/src/libs/clangbackendipc/pchmanagerclientinterface.h b/src/libs/clangsupport/pchmanagerclientinterface.h
index 771951641a..771951641a 100644
--- a/src/libs/clangbackendipc/pchmanagerclientinterface.h
+++ b/src/libs/clangsupport/pchmanagerclientinterface.h
diff --git a/src/libs/clangbackendipc/pchmanagerclientproxy.cpp b/src/libs/clangsupport/pchmanagerclientproxy.cpp
index ad583113bb..ad583113bb 100644
--- a/src/libs/clangbackendipc/pchmanagerclientproxy.cpp
+++ b/src/libs/clangsupport/pchmanagerclientproxy.cpp
diff --git a/src/libs/clangbackendipc/pchmanagerclientproxy.h b/src/libs/clangsupport/pchmanagerclientproxy.h
index 210e5b0125..71361881e9 100644
--- a/src/libs/clangbackendipc/pchmanagerclientproxy.h
+++ b/src/libs/clangsupport/pchmanagerclientproxy.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 #include "pchmanagerclientinterface.h"
 #include "readmessageblock.h"
 #include "writemessageblock.h"
diff --git a/src/libs/clangbackendipc/pchmanagerserverinterface.cpp b/src/libs/clangsupport/pchmanagerserverinterface.cpp
index 1a6d9d4a25..1a6d9d4a25 100644
--- a/src/libs/clangbackendipc/pchmanagerserverinterface.cpp
+++ b/src/libs/clangsupport/pchmanagerserverinterface.cpp
diff --git a/src/libs/clangbackendipc/pchmanagerserverinterface.h b/src/libs/clangsupport/pchmanagerserverinterface.h
index 58ce649997..58ce649997 100644
--- a/src/libs/clangbackendipc/pchmanagerserverinterface.h
+++ b/src/libs/clangsupport/pchmanagerserverinterface.h
diff --git a/src/libs/clangbackendipc/pchmanagerserverproxy.cpp b/src/libs/clangsupport/pchmanagerserverproxy.cpp
index d513fddc87..d513fddc87 100644
--- a/src/libs/clangbackendipc/pchmanagerserverproxy.cpp
+++ b/src/libs/clangsupport/pchmanagerserverproxy.cpp
diff --git a/src/libs/clangbackendipc/pchmanagerserverproxy.h b/src/libs/clangsupport/pchmanagerserverproxy.h
index 0b4e593bc1..6b7c212934 100644
--- a/src/libs/clangbackendipc/pchmanagerserverproxy.h
+++ b/src/libs/clangsupport/pchmanagerserverproxy.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 #include "pchmanagerserverinterface.h"
 #include "readmessageblock.h"
 #include "writemessageblock.h"
diff --git a/src/libs/clangbackendipc/precompiledheadersupdatedmessage.cpp b/src/libs/clangsupport/precompiledheadersupdatedmessage.cpp
index 38c56be38b..38c56be38b 100644
--- a/src/libs/clangbackendipc/precompiledheadersupdatedmessage.cpp
+++ b/src/libs/clangsupport/precompiledheadersupdatedmessage.cpp
diff --git a/src/libs/clangbackendipc/precompiledheadersupdatedmessage.h b/src/libs/clangsupport/precompiledheadersupdatedmessage.h
index e4fdcda011..e4fdcda011 100644
--- a/src/libs/clangbackendipc/precompiledheadersupdatedmessage.h
+++ b/src/libs/clangsupport/precompiledheadersupdatedmessage.h
diff --git a/src/libs/clangbackendipc/projectpartcontainer.cpp b/src/libs/clangsupport/projectpartcontainer.cpp
index f39ba741c3..9fc1e8d905 100644
--- a/src/libs/clangbackendipc/projectpartcontainer.cpp
+++ b/src/libs/clangsupport/projectpartcontainer.cpp
@@ -25,7 +25,7 @@
 
 #include "projectpartcontainer.h"
 
-#include "clangbackendipcdebugutils.h"
+#include "clangsupportdebugutils.h"
 
 #include <QDebug>
 
diff --git a/src/libs/clangbackendipc/projectpartcontainer.h b/src/libs/clangsupport/projectpartcontainer.h
index 6d5fb147f1..9c735632a5 100644
--- a/src/libs/clangbackendipc/projectpartcontainer.h
+++ b/src/libs/clangsupport/projectpartcontainer.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 
 #include <utf8stringvector.h>
 
diff --git a/src/libs/clangbackendipc/projectpartcontainerv2.cpp b/src/libs/clangsupport/projectpartcontainerv2.cpp
index 89b489ee5b..89b489ee5b 100644
--- a/src/libs/clangbackendipc/projectpartcontainerv2.cpp
+++ b/src/libs/clangsupport/projectpartcontainerv2.cpp
diff --git a/src/libs/clangbackendipc/projectpartcontainerv2.h b/src/libs/clangsupport/projectpartcontainerv2.h
index a0ad06f3ca..be2102fad3 100644
--- a/src/libs/clangbackendipc/projectpartcontainerv2.h
+++ b/src/libs/clangsupport/projectpartcontainerv2.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 
 #include <utils/smallstringio.h>
 
diff --git a/src/libs/clangbackendipc/projectpartpch.cpp b/src/libs/clangsupport/projectpartpch.cpp
index 0df291b3df..0df291b3df 100644
--- a/src/libs/clangbackendipc/projectpartpch.cpp
+++ b/src/libs/clangsupport/projectpartpch.cpp
diff --git a/src/libs/clangbackendipc/projectpartpch.h b/src/libs/clangsupport/projectpartpch.h
index 6798f0eafb..5ddbca57a0 100644
--- a/src/libs/clangbackendipc/projectpartpch.h
+++ b/src/libs/clangsupport/projectpartpch.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 
 #include <utils/smallstringio.h>
 
diff --git a/src/libs/clangbackendipc/projectpartsdonotexistmessage.cpp b/src/libs/clangsupport/projectpartsdonotexistmessage.cpp
index 18fc44e0ab..18fc44e0ab 100644
--- a/src/libs/clangbackendipc/projectpartsdonotexistmessage.cpp
+++ b/src/libs/clangsupport/projectpartsdonotexistmessage.cpp
diff --git a/src/libs/clangbackendipc/projectpartsdonotexistmessage.h b/src/libs/clangsupport/projectpartsdonotexistmessage.h
index 65a8132dc5..1c57992906 100644
--- a/src/libs/clangbackendipc/projectpartsdonotexistmessage.h
+++ b/src/libs/clangsupport/projectpartsdonotexistmessage.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 
 #include <utf8stringvector.h>
 
diff --git a/src/libs/clangbackendipc/readmessageblock.cpp b/src/libs/clangsupport/readmessageblock.cpp
index e566093074..e566093074 100644
--- a/src/libs/clangbackendipc/readmessageblock.cpp
+++ b/src/libs/clangsupport/readmessageblock.cpp
diff --git a/src/libs/clangbackendipc/readmessageblock.h b/src/libs/clangsupport/readmessageblock.h
index 54c06b9fe6..54c06b9fe6 100644
--- a/src/libs/clangbackendipc/readmessageblock.h
+++ b/src/libs/clangsupport/readmessageblock.h
diff --git a/src/libs/clangbackendipc/refactoringclientinterface.cpp b/src/libs/clangsupport/refactoringclientinterface.cpp
index fc69cd0cd5..fc69cd0cd5 100644
--- a/src/libs/clangbackendipc/refactoringclientinterface.cpp
+++ b/src/libs/clangsupport/refactoringclientinterface.cpp
diff --git a/src/libs/clangbackendipc/refactoringclientinterface.h b/src/libs/clangsupport/refactoringclientinterface.h
index 8f10986929..8f10986929 100644
--- a/src/libs/clangbackendipc/refactoringclientinterface.h
+++ b/src/libs/clangsupport/refactoringclientinterface.h
diff --git a/src/libs/clangbackendipc/refactoringclientproxy.cpp b/src/libs/clangsupport/refactoringclientproxy.cpp
index 576489aa25..576489aa25 100644
--- a/src/libs/clangbackendipc/refactoringclientproxy.cpp
+++ b/src/libs/clangsupport/refactoringclientproxy.cpp
diff --git a/src/libs/clangbackendipc/refactoringclientproxy.h b/src/libs/clangsupport/refactoringclientproxy.h
index 2f7c3af980..482fde8b1f 100644
--- a/src/libs/clangbackendipc/refactoringclientproxy.h
+++ b/src/libs/clangsupport/refactoringclientproxy.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 #include "refactoringclientinterface.h"
 #include "readmessageblock.h"
 #include "writemessageblock.h"
diff --git a/src/libs/clangbackendipc/refactoringserverinterface.cpp b/src/libs/clangsupport/refactoringserverinterface.cpp
index d6b0f6815b..d6b0f6815b 100644
--- a/src/libs/clangbackendipc/refactoringserverinterface.cpp
+++ b/src/libs/clangsupport/refactoringserverinterface.cpp
diff --git a/src/libs/clangbackendipc/refactoringserverinterface.h b/src/libs/clangsupport/refactoringserverinterface.h
index 8c36a7351e..8c36a7351e 100644
--- a/src/libs/clangbackendipc/refactoringserverinterface.h
+++ b/src/libs/clangsupport/refactoringserverinterface.h
diff --git a/src/libs/clangbackendipc/refactoringserverproxy.cpp b/src/libs/clangsupport/refactoringserverproxy.cpp
index 0cf4473f07..0cf4473f07 100644
--- a/src/libs/clangbackendipc/refactoringserverproxy.cpp
+++ b/src/libs/clangsupport/refactoringserverproxy.cpp
diff --git a/src/libs/clangbackendipc/refactoringserverproxy.h b/src/libs/clangsupport/refactoringserverproxy.h
index 73d165a9a0..9b10e37529 100644
--- a/src/libs/clangbackendipc/refactoringserverproxy.h
+++ b/src/libs/clangsupport/refactoringserverproxy.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 #include "refactoringserverinterface.h"
 #include "readmessageblock.h"
 #include "writemessageblock.h"
diff --git a/src/libs/clangbackendipc/referencesmessage.cpp b/src/libs/clangsupport/referencesmessage.cpp
index 8b994a7d7c..8b994a7d7c 100644
--- a/src/libs/clangbackendipc/referencesmessage.cpp
+++ b/src/libs/clangsupport/referencesmessage.cpp
diff --git a/src/libs/clangbackendipc/referencesmessage.h b/src/libs/clangsupport/referencesmessage.h
index 5d0b4d292a..5d0b4d292a 100644
--- a/src/libs/clangbackendipc/referencesmessage.h
+++ b/src/libs/clangsupport/referencesmessage.h
diff --git a/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.cpp b/src/libs/clangsupport/registerunsavedfilesforeditormessage.cpp
index 2881382ce8..2881382ce8 100644
--- a/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.cpp
+++ b/src/libs/clangsupport/registerunsavedfilesforeditormessage.cpp
diff --git a/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.h b/src/libs/clangsupport/registerunsavedfilesforeditormessage.h
index 973fe9294f..973fe9294f 100644
--- a/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.h
+++ b/src/libs/clangsupport/registerunsavedfilesforeditormessage.h
diff --git a/src/libs/clangbackendipc/removepchprojectpartsmessage.cpp b/src/libs/clangsupport/removepchprojectpartsmessage.cpp
index 24c657336a..24c657336a 100644
--- a/src/libs/clangbackendipc/removepchprojectpartsmessage.cpp
+++ b/src/libs/clangsupport/removepchprojectpartsmessage.cpp
diff --git a/src/libs/clangbackendipc/removepchprojectpartsmessage.h b/src/libs/clangsupport/removepchprojectpartsmessage.h
index c6ae105dd0..c6ae105dd0 100644
--- a/src/libs/clangbackendipc/removepchprojectpartsmessage.h
+++ b/src/libs/clangsupport/removepchprojectpartsmessage.h
diff --git a/src/libs/clangbackendipc/requestdocumentannotations.cpp b/src/libs/clangsupport/requestdocumentannotations.cpp
index 6d3400ccc3..6d3400ccc3 100644
--- a/src/libs/clangbackendipc/requestdocumentannotations.cpp
+++ b/src/libs/clangsupport/requestdocumentannotations.cpp
diff --git a/src/libs/clangbackendipc/requestdocumentannotations.h b/src/libs/clangsupport/requestdocumentannotations.h
index e8facfef33..e8facfef33 100644
--- a/src/libs/clangbackendipc/requestdocumentannotations.h
+++ b/src/libs/clangsupport/requestdocumentannotations.h
diff --git a/src/libs/clangbackendipc/requestfollowsymbolmessage.cpp b/src/libs/clangsupport/requestfollowsymbolmessage.cpp
index 9d31139840..9d31139840 100644
--- a/src/libs/clangbackendipc/requestfollowsymbolmessage.cpp
+++ b/src/libs/clangsupport/requestfollowsymbolmessage.cpp
diff --git a/src/libs/clangbackendipc/requestfollowsymbolmessage.h b/src/libs/clangsupport/requestfollowsymbolmessage.h
index fe564bf828..a9c37e101a 100644
--- a/src/libs/clangbackendipc/requestfollowsymbolmessage.h
+++ b/src/libs/clangsupport/requestfollowsymbolmessage.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 
 #include "filecontainer.h"
 
diff --git a/src/libs/clangbackendipc/requestreferencesmessage.cpp b/src/libs/clangsupport/requestreferencesmessage.cpp
index 0527db59d6..0527db59d6 100644
--- a/src/libs/clangbackendipc/requestreferencesmessage.cpp
+++ b/src/libs/clangsupport/requestreferencesmessage.cpp
diff --git a/src/libs/clangbackendipc/requestreferencesmessage.h b/src/libs/clangsupport/requestreferencesmessage.h
index 8d76c1c5af..8757799d20 100644
--- a/src/libs/clangbackendipc/requestreferencesmessage.h
+++ b/src/libs/clangsupport/requestreferencesmessage.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 
 #include "filecontainer.h"
 
diff --git a/src/libs/clangbackendipc/requestsourcelocationforrenamingmessage.cpp b/src/libs/clangsupport/requestsourcelocationforrenamingmessage.cpp
index 6d5d8a24a1..6d5d8a24a1 100644
--- a/src/libs/clangbackendipc/requestsourcelocationforrenamingmessage.cpp
+++ b/src/libs/clangsupport/requestsourcelocationforrenamingmessage.cpp
diff --git a/src/libs/clangbackendipc/requestsourcelocationforrenamingmessage.h b/src/libs/clangsupport/requestsourcelocationforrenamingmessage.h
index 8b1f46798c..271202cda3 100644
--- a/src/libs/clangbackendipc/requestsourcelocationforrenamingmessage.h
+++ b/src/libs/clangsupport/requestsourcelocationforrenamingmessage.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 #include "filepath.h"
 
 #include <utils/smallstringvector.h>
diff --git a/src/libs/clangbackendipc/requestsourcerangesanddiagnosticsforquerymessage.cpp b/src/libs/clangsupport/requestsourcerangesanddiagnosticsforquerymessage.cpp
index 878f11f0de..878f11f0de 100644
--- a/src/libs/clangbackendipc/requestsourcerangesanddiagnosticsforquerymessage.cpp
+++ b/src/libs/clangsupport/requestsourcerangesanddiagnosticsforquerymessage.cpp
diff --git a/src/libs/clangbackendipc/requestsourcerangesanddiagnosticsforquerymessage.h b/src/libs/clangsupport/requestsourcerangesanddiagnosticsforquerymessage.h
index afac9e9b6b..afac9e9b6b 100644
--- a/src/libs/clangbackendipc/requestsourcerangesanddiagnosticsforquerymessage.h
+++ b/src/libs/clangsupport/requestsourcerangesanddiagnosticsforquerymessage.h
diff --git a/src/libs/clangbackendipc/requestsourcerangesforquerymessage.cpp b/src/libs/clangsupport/requestsourcerangesforquerymessage.cpp
index ab5b8d8468..ab5b8d8468 100644
--- a/src/libs/clangbackendipc/requestsourcerangesforquerymessage.cpp
+++ b/src/libs/clangsupport/requestsourcerangesforquerymessage.cpp
diff --git a/src/libs/clangbackendipc/requestsourcerangesforquerymessage.h b/src/libs/clangsupport/requestsourcerangesforquerymessage.h
index 1dc3ca6ac5..1dc3ca6ac5 100644
--- a/src/libs/clangbackendipc/requestsourcerangesforquerymessage.h
+++ b/src/libs/clangsupport/requestsourcerangesforquerymessage.h
diff --git a/src/libs/clangbackendipc/sourcefilepathcontainerbase.cpp b/src/libs/clangsupport/sourcefilepathcontainerbase.cpp
index 66d44d8827..66d44d8827 100644
--- a/src/libs/clangbackendipc/sourcefilepathcontainerbase.cpp
+++ b/src/libs/clangsupport/sourcefilepathcontainerbase.cpp
diff --git a/src/libs/clangbackendipc/sourcefilepathcontainerbase.h b/src/libs/clangsupport/sourcefilepathcontainerbase.h
index ebf717f15e..ebf717f15e 100644
--- a/src/libs/clangbackendipc/sourcefilepathcontainerbase.h
+++ b/src/libs/clangsupport/sourcefilepathcontainerbase.h
diff --git a/src/libs/clangbackendipc/sourcelocationcontainer.cpp b/src/libs/clangsupport/sourcelocationcontainer.cpp
index f4c9648f56..f4c9648f56 100644
--- a/src/libs/clangbackendipc/sourcelocationcontainer.cpp
+++ b/src/libs/clangsupport/sourcelocationcontainer.cpp
diff --git a/src/libs/clangbackendipc/sourcelocationcontainer.h b/src/libs/clangsupport/sourcelocationcontainer.h
index 6514b48469..80971e8ee8 100644
--- a/src/libs/clangbackendipc/sourcelocationcontainer.h
+++ b/src/libs/clangsupport/sourcelocationcontainer.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 
 #include <utf8string.h>
 
diff --git a/src/libs/clangbackendipc/sourcelocationcontainerv2.cpp b/src/libs/clangsupport/sourcelocationcontainerv2.cpp
index 3206daf2b5..3206daf2b5 100644
--- a/src/libs/clangbackendipc/sourcelocationcontainerv2.cpp
+++ b/src/libs/clangsupport/sourcelocationcontainerv2.cpp
diff --git a/src/libs/clangbackendipc/sourcelocationcontainerv2.h b/src/libs/clangsupport/sourcelocationcontainerv2.h
index db54c7c028..def1c389fa 100644
--- a/src/libs/clangbackendipc/sourcelocationcontainerv2.h
+++ b/src/libs/clangsupport/sourcelocationcontainerv2.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 
 #include <QDataStream>
 
diff --git a/src/libs/clangbackendipc/sourcelocationscontainer.cpp b/src/libs/clangsupport/sourcelocationscontainer.cpp
index c5775e6a76..c5775e6a76 100644
--- a/src/libs/clangbackendipc/sourcelocationscontainer.cpp
+++ b/src/libs/clangsupport/sourcelocationscontainer.cpp
diff --git a/src/libs/clangbackendipc/sourcelocationscontainer.h b/src/libs/clangsupport/sourcelocationscontainer.h
index 731ad16906..731ad16906 100644
--- a/src/libs/clangbackendipc/sourcelocationscontainer.h
+++ b/src/libs/clangsupport/sourcelocationscontainer.h
diff --git a/src/libs/clangbackendipc/sourcelocationsforrenamingmessage.cpp b/src/libs/clangsupport/sourcelocationsforrenamingmessage.cpp
index 0ce0b8f7a8..0ce0b8f7a8 100644
--- a/src/libs/clangbackendipc/sourcelocationsforrenamingmessage.cpp
+++ b/src/libs/clangsupport/sourcelocationsforrenamingmessage.cpp
diff --git a/src/libs/clangbackendipc/sourcelocationsforrenamingmessage.h b/src/libs/clangsupport/sourcelocationsforrenamingmessage.h
index 5362ed2e46..5362ed2e46 100644
--- a/src/libs/clangbackendipc/sourcelocationsforrenamingmessage.h
+++ b/src/libs/clangsupport/sourcelocationsforrenamingmessage.h
diff --git a/src/libs/clangbackendipc/sourcerangecontainer.cpp b/src/libs/clangsupport/sourcerangecontainer.cpp
index a2db7545eb..a2db7545eb 100644
--- a/src/libs/clangbackendipc/sourcerangecontainer.cpp
+++ b/src/libs/clangsupport/sourcerangecontainer.cpp
diff --git a/src/libs/clangbackendipc/sourcerangecontainer.h b/src/libs/clangsupport/sourcerangecontainer.h
index ff871cf8ed..ff871cf8ed 100644
--- a/src/libs/clangbackendipc/sourcerangecontainer.h
+++ b/src/libs/clangsupport/sourcerangecontainer.h
diff --git a/src/libs/clangbackendipc/sourcerangecontainerv2.cpp b/src/libs/clangsupport/sourcerangecontainerv2.cpp
index 47907beb8d..47907beb8d 100644
--- a/src/libs/clangbackendipc/sourcerangecontainerv2.cpp
+++ b/src/libs/clangsupport/sourcerangecontainerv2.cpp
diff --git a/src/libs/clangbackendipc/sourcerangecontainerv2.h b/src/libs/clangsupport/sourcerangecontainerv2.h
index a5dba3ddf1..a5dba3ddf1 100644
--- a/src/libs/clangbackendipc/sourcerangecontainerv2.h
+++ b/src/libs/clangsupport/sourcerangecontainerv2.h
diff --git a/src/libs/clangbackendipc/sourcerangesanddiagnosticsforquerymessage.cpp b/src/libs/clangsupport/sourcerangesanddiagnosticsforquerymessage.cpp
index f4ac78ea43..f4ac78ea43 100644
--- a/src/libs/clangbackendipc/sourcerangesanddiagnosticsforquerymessage.cpp
+++ b/src/libs/clangsupport/sourcerangesanddiagnosticsforquerymessage.cpp
diff --git a/src/libs/clangbackendipc/sourcerangesanddiagnosticsforquerymessage.h b/src/libs/clangsupport/sourcerangesanddiagnosticsforquerymessage.h
index f91db432f6..f91db432f6 100644
--- a/src/libs/clangbackendipc/sourcerangesanddiagnosticsforquerymessage.h
+++ b/src/libs/clangsupport/sourcerangesanddiagnosticsforquerymessage.h
diff --git a/src/libs/clangbackendipc/sourcerangescontainer.cpp b/src/libs/clangsupport/sourcerangescontainer.cpp
index ff833be874..ff833be874 100644
--- a/src/libs/clangbackendipc/sourcerangescontainer.cpp
+++ b/src/libs/clangsupport/sourcerangescontainer.cpp
diff --git a/src/libs/clangbackendipc/sourcerangescontainer.h b/src/libs/clangsupport/sourcerangescontainer.h
index 6968830a6d..6968830a6d 100644
--- a/src/libs/clangbackendipc/sourcerangescontainer.h
+++ b/src/libs/clangsupport/sourcerangescontainer.h
diff --git a/src/libs/clangbackendipc/sourcerangesforquerymessage.cpp b/src/libs/clangsupport/sourcerangesforquerymessage.cpp
index e9227b3a66..e9227b3a66 100644
--- a/src/libs/clangbackendipc/sourcerangesforquerymessage.cpp
+++ b/src/libs/clangsupport/sourcerangesforquerymessage.cpp
diff --git a/src/libs/clangbackendipc/sourcerangesforquerymessage.h b/src/libs/clangsupport/sourcerangesforquerymessage.h
index 7aa410e1ae..7aa410e1ae 100644
--- a/src/libs/clangbackendipc/sourcerangesforquerymessage.h
+++ b/src/libs/clangsupport/sourcerangesforquerymessage.h
diff --git a/src/libs/clangbackendipc/sourcerangewithtextcontainer.cpp b/src/libs/clangsupport/sourcerangewithtextcontainer.cpp
index 82f410c896..82f410c896 100644
--- a/src/libs/clangbackendipc/sourcerangewithtextcontainer.cpp
+++ b/src/libs/clangsupport/sourcerangewithtextcontainer.cpp
diff --git a/src/libs/clangbackendipc/sourcerangewithtextcontainer.h b/src/libs/clangsupport/sourcerangewithtextcontainer.h
index 4edb231550..4edb231550 100644
--- a/src/libs/clangbackendipc/sourcerangewithtextcontainer.h
+++ b/src/libs/clangsupport/sourcerangewithtextcontainer.h
diff --git a/src/libs/clangbackendipc/stringcache.h b/src/libs/clangsupport/stringcache.h
index a6f8d4633e..a6f8d4633e 100644
--- a/src/libs/clangbackendipc/stringcache.h
+++ b/src/libs/clangsupport/stringcache.h
diff --git a/src/libs/clangbackendipc/stringcachefwd.h b/src/libs/clangsupport/stringcachefwd.h
index 35b8534254..35b8534254 100644
--- a/src/libs/clangbackendipc/stringcachefwd.h
+++ b/src/libs/clangsupport/stringcachefwd.h
diff --git a/src/libs/clangbackendipc/translationunitdoesnotexistmessage.cpp b/src/libs/clangsupport/translationunitdoesnotexistmessage.cpp
index 28f54325bb..28f54325bb 100644
--- a/src/libs/clangbackendipc/translationunitdoesnotexistmessage.cpp
+++ b/src/libs/clangsupport/translationunitdoesnotexistmessage.cpp
diff --git a/src/libs/clangbackendipc/translationunitdoesnotexistmessage.h b/src/libs/clangsupport/translationunitdoesnotexistmessage.h
index 67c6601fae..67c6601fae 100644
--- a/src/libs/clangbackendipc/translationunitdoesnotexistmessage.h
+++ b/src/libs/clangsupport/translationunitdoesnotexistmessage.h
diff --git a/src/libs/clangbackendipc/unregisterunsavedfilesforeditormessage.cpp b/src/libs/clangsupport/unregisterunsavedfilesforeditormessage.cpp
index 7cd1403909..7cd1403909 100644
--- a/src/libs/clangbackendipc/unregisterunsavedfilesforeditormessage.cpp
+++ b/src/libs/clangsupport/unregisterunsavedfilesforeditormessage.cpp
diff --git a/src/libs/clangbackendipc/unregisterunsavedfilesforeditormessage.h b/src/libs/clangsupport/unregisterunsavedfilesforeditormessage.h
index cc43e18872..cc43e18872 100644
--- a/src/libs/clangbackendipc/unregisterunsavedfilesforeditormessage.h
+++ b/src/libs/clangsupport/unregisterunsavedfilesforeditormessage.h
diff --git a/src/libs/clangbackendipc/updatepchprojectpartsmessage.cpp b/src/libs/clangsupport/updatepchprojectpartsmessage.cpp
index f86ef12aac..f86ef12aac 100644
--- a/src/libs/clangbackendipc/updatepchprojectpartsmessage.cpp
+++ b/src/libs/clangsupport/updatepchprojectpartsmessage.cpp
diff --git a/src/libs/clangbackendipc/updatepchprojectpartsmessage.h b/src/libs/clangsupport/updatepchprojectpartsmessage.h
index 67301faf44..67301faf44 100644
--- a/src/libs/clangbackendipc/updatepchprojectpartsmessage.h
+++ b/src/libs/clangsupport/updatepchprojectpartsmessage.h
diff --git a/src/libs/clangbackendipc/updatetranslationunitsforeditormessage.cpp b/src/libs/clangsupport/updatetranslationunitsforeditormessage.cpp
index 0dc0d861a7..0dc0d861a7 100644
--- a/src/libs/clangbackendipc/updatetranslationunitsforeditormessage.cpp
+++ b/src/libs/clangsupport/updatetranslationunitsforeditormessage.cpp
diff --git a/src/libs/clangbackendipc/updatetranslationunitsforeditormessage.h b/src/libs/clangsupport/updatetranslationunitsforeditormessage.h
index 3838ea89ae..3838ea89ae 100644
--- a/src/libs/clangbackendipc/updatetranslationunitsforeditormessage.h
+++ b/src/libs/clangsupport/updatetranslationunitsforeditormessage.h
diff --git a/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.cpp b/src/libs/clangsupport/updatevisibletranslationunitsmessage.cpp
index 00f154f4c8..00f154f4c8 100644
--- a/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.cpp
+++ b/src/libs/clangsupport/updatevisibletranslationunitsmessage.cpp
diff --git a/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.h b/src/libs/clangsupport/updatevisibletranslationunitsmessage.h
index 033d3a98a1..cdd57fe2f1 100644
--- a/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.h
+++ b/src/libs/clangsupport/updatevisibletranslationunitsmessage.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 
 #include <utf8stringvector.h>
 
diff --git a/src/libs/clangbackendipc/writemessageblock.cpp b/src/libs/clangsupport/writemessageblock.cpp
index 7561d4cd64..7561d4cd64 100644
--- a/src/libs/clangbackendipc/writemessageblock.cpp
+++ b/src/libs/clangsupport/writemessageblock.cpp
diff --git a/src/libs/clangbackendipc/writemessageblock.h b/src/libs/clangsupport/writemessageblock.h
index edf1d74a1c..edf1d74a1c 100644
--- a/src/libs/clangbackendipc/writemessageblock.h
+++ b/src/libs/clangsupport/writemessageblock.h
diff --git a/src/libs/libs.pro b/src/libs/libs.pro
index 178a7a4cb8..669dc0183a 100644
--- a/src/libs/libs.pro
+++ b/src/libs/libs.pro
@@ -15,7 +15,7 @@ SUBDIRS   = \
     glsl \
     ssh \
     sqlite \
-    clangbackendipc
+    clangsupport
 
 qtHaveModule(quick) {
     SUBDIRS += \
diff --git a/src/libs/libs.qbs b/src/libs/libs.qbs
index 29eb744c1a..4eedda662c 100644
--- a/src/libs/libs.qbs
+++ b/src/libs/libs.qbs
@@ -4,7 +4,7 @@ Project {
     name: "Libs"
     references: [
         "aggregation/aggregation.qbs",
-        "clangbackendipc/clangbackendipc.qbs",
+        "clangsupport/clangsupport.qbs",
         "cplusplus/cplusplus.qbs",
         "extensionsystem/extensionsystem.qbs",
         "flamegraph/flamegraph.qbs",
diff --git a/src/plugins/clangcodemodel/clangassistproposalmodel.h b/src/plugins/clangcodemodel/clangassistproposalmodel.h
index 6a72214513..b71d256856 100644
--- a/src/plugins/clangcodemodel/clangassistproposalmodel.h
+++ b/src/plugins/clangcodemodel/clangassistproposalmodel.h
@@ -29,7 +29,7 @@
 
 #include <texteditor/codeassist/genericproposalmodel.h>
 
-#include <clangbackendipc/clangbackendipc_global.h>
+#include <clangsupport/clangsupport_global.h>
 
 namespace ClangCodeModel {
 namespace Internal {
diff --git a/src/plugins/clangcodemodel/clangbackendipcintegration.cpp b/src/plugins/clangcodemodel/clangbackendipcintegration.cpp
index 8be441b7d6..1d1ab500d8 100644
--- a/src/plugins/clangcodemodel/clangbackendipcintegration.cpp
+++ b/src/plugins/clangcodemodel/clangbackendipcintegration.cpp
@@ -48,9 +48,9 @@
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
 
-#include <clangbackendipc/clangcodemodelservermessages.h>
-#include <clangbackendipc/clangcodemodelclientmessages.h>
-#include <clangbackendipc/filecontainer.h>
+#include <clangsupport/clangcodemodelservermessages.h>
+#include <clangsupport/clangcodemodelclientmessages.h>
+#include <clangsupport/filecontainer.h>
 
 #include <cplusplus/Icons.h>
 
diff --git a/src/plugins/clangcodemodel/clangbackendipcintegration.h b/src/plugins/clangcodemodel/clangbackendipcintegration.h
index 36258667ef..fe38435220 100644
--- a/src/plugins/clangcodemodel/clangbackendipcintegration.h
+++ b/src/plugins/clangcodemodel/clangbackendipcintegration.h
@@ -29,10 +29,10 @@
 #include <cpptools/cppcursorinfo.h>
 #include <cpptools/cppsymbolinfo.h>
 
-#include <clangbackendipc/clangcodemodelconnectionclient.h>
-#include <clangbackendipc/filecontainer.h>
-#include <clangbackendipc/clangcodemodelclientinterface.h>
-#include <clangbackendipc/projectpartcontainer.h>
+#include <clangsupport/clangcodemodelconnectionclient.h>
+#include <clangsupport/filecontainer.h>
+#include <clangsupport/clangcodemodelclientinterface.h>
+#include <clangsupport/projectpartcontainer.h>
 
 #include <QFuture>
 #include <QObject>
diff --git a/src/plugins/clangcodemodel/clangcodemodel.qbs b/src/plugins/clangcodemodel/clangcodemodel.qbs
index eb46d8f2bd..6223c12434 100644
--- a/src/plugins/clangcodemodel/clangcodemodel.qbs
+++ b/src/plugins/clangcodemodel/clangcodemodel.qbs
@@ -10,7 +10,7 @@ QtcPlugin {
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
     Depends { name: "Utils" }
-    Depends { name: "ClangBackEndIpc" }
+    Depends { name: "ClangSupport" }
     Depends { name: "libclang"; required: false }
 
     pluginTestDepends: [
@@ -41,7 +41,7 @@ QtcPlugin {
         "clangassistproposalitem.h",
         "clangassistproposalmodel.cpp",
         "clangassistproposalmodel.h",
-        "clangbackendipcintegration.cpp",
+        "clangsupportintegration.cpp",
         "clangbackendipcintegration.h",
         "clangcodemodelplugin.cpp",
         "clangcodemodelplugin.h",
diff --git a/src/plugins/clangcodemodel/clangcodemodel_dependencies.pri b/src/plugins/clangcodemodel/clangcodemodel_dependencies.pri
index 335569d766..9b44838b01 100644
--- a/src/plugins/clangcodemodel/clangcodemodel_dependencies.pri
+++ b/src/plugins/clangcodemodel/clangcodemodel_dependencies.pri
@@ -1,7 +1,7 @@
 QTC_PLUGIN_NAME = ClangCodeModel
 QTC_LIB_DEPENDS += \
     utils \
-    clangbackendipc
+    clangsupport
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
     cpptools \
diff --git a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp
index 9d84b3ba81..1cd9a770d7 100644
--- a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp
+++ b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp
@@ -49,7 +49,7 @@
 #include <cplusplus/Icons.h>
 #include <cplusplus/SimpleLexer.h>
 
-#include <clangbackendipc/filecontainer.h>
+#include <clangsupport/filecontainer.h>
 
 #include <utils/algorithm.h>
 #include <utils/mimetypes/mimedatabase.h>
diff --git a/src/plugins/clangcodemodel/clangcompletionassistprocessor.h b/src/plugins/clangcodemodel/clangcompletionassistprocessor.h
index 8b67116e87..4172d646f4 100644
--- a/src/plugins/clangcodemodel/clangcompletionassistprocessor.h
+++ b/src/plugins/clangcodemodel/clangcompletionassistprocessor.h
@@ -29,7 +29,7 @@
 
 #include <cpptools/cppcompletionassistprocessor.h>
 
-#include <clangbackendipc/codecompletion.h>
+#include <clangsupport/codecompletion.h>
 
 #include <QCoreApplication>
 #include <QTextCursor>
diff --git a/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.h b/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.h
index 4a8f6b8a95..27eccbcf16 100644
--- a/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.h
+++ b/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <clangbackendipc/codecompletion.h>
+#include <clangsupport/codecompletion.h>
 
 #include <sqlite/utf8string.h>
 
diff --git a/src/plugins/clangcodemodel/clangdiagnosticfilter.h b/src/plugins/clangcodemodel/clangdiagnosticfilter.h
index 9329d43ceb..0fe164ecf0 100644
--- a/src/plugins/clangcodemodel/clangdiagnosticfilter.h
+++ b/src/plugins/clangcodemodel/clangdiagnosticfilter.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <clangbackendipc/diagnosticcontainer.h>
+#include <clangsupport/diagnosticcontainer.h>
 
 #include <QVector>
 
diff --git a/src/plugins/clangcodemodel/clangdiagnosticmanager.h b/src/plugins/clangcodemodel/clangdiagnosticmanager.h
index 1321702c99..dff768a09d 100644
--- a/src/plugins/clangcodemodel/clangdiagnosticmanager.h
+++ b/src/plugins/clangcodemodel/clangdiagnosticmanager.h
@@ -29,7 +29,7 @@
 
 #include <texteditor/refactoroverlay.h>
 
-#include <clangbackendipc/diagnosticcontainer.h>
+#include <clangsupport/diagnosticcontainer.h>
 
 #include <QList>
 #include <QSet>
diff --git a/src/plugins/clangcodemodel/clangdiagnostictooltipwidget.h b/src/plugins/clangcodemodel/clangdiagnostictooltipwidget.h
index 3ea1bfb0ad..91fdfc67d6 100644
--- a/src/plugins/clangcodemodel/clangdiagnostictooltipwidget.h
+++ b/src/plugins/clangcodemodel/clangdiagnostictooltipwidget.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <clangbackendipc/diagnosticcontainer.h>
+#include <clangsupport/diagnosticcontainer.h>
 
 QT_BEGIN_NAMESPACE
 class QLayout;
diff --git a/src/plugins/clangcodemodel/clangfixitoperation.h b/src/plugins/clangcodemodel/clangfixitoperation.h
index e4183451b4..1270e98f36 100644
--- a/src/plugins/clangcodemodel/clangfixitoperation.h
+++ b/src/plugins/clangcodemodel/clangfixitoperation.h
@@ -27,7 +27,7 @@
 
 #include <texteditor/quickfix.h>
 
-#include <clangbackendipc/fixitcontainer.h>
+#include <clangsupport/fixitcontainer.h>
 
 #include <utils/changeset.h>
 
diff --git a/src/plugins/clangcodemodel/clangfixitoperationsextractor.h b/src/plugins/clangcodemodel/clangfixitoperationsextractor.h
index f0b1fb83ab..ee2da9a4b2 100644
--- a/src/plugins/clangcodemodel/clangfixitoperationsextractor.h
+++ b/src/plugins/clangcodemodel/clangfixitoperationsextractor.h
@@ -27,7 +27,7 @@
 
 #include <texteditor/quickfix.h>
 
-#include <clangbackendipc/diagnosticcontainer.h>
+#include <clangsupport/diagnosticcontainer.h>
 
 namespace ClangCodeModel {
 
diff --git a/src/plugins/clangcodemodel/clanghighlightingmarksreporter.h b/src/plugins/clangcodemodel/clanghighlightingmarksreporter.h
index af4f1773b0..379e2c55f6 100644
--- a/src/plugins/clangcodemodel/clanghighlightingmarksreporter.h
+++ b/src/plugins/clangcodemodel/clanghighlightingmarksreporter.h
@@ -32,7 +32,7 @@
 
 #include <texteditor/semantichighlighter.h>
 
-#include <clangbackendipc/highlightingmarkcontainer.h>
+#include <clangsupport/highlightingmarkcontainer.h>
 
 namespace ClangCodeModel {
 
diff --git a/src/plugins/clangcodemodel/clangisdiagnosticrelatedtolocation.h b/src/plugins/clangcodemodel/clangisdiagnosticrelatedtolocation.h
index 8d44634bac..2676bbffde 100644
--- a/src/plugins/clangcodemodel/clangisdiagnosticrelatedtolocation.h
+++ b/src/plugins/clangcodemodel/clangisdiagnosticrelatedtolocation.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <clangbackendipc/diagnosticcontainer.h>
+#include <clangsupport/diagnosticcontainer.h>
 
 namespace ClangCodeModel {
 namespace Internal {
diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
index a2dd65103b..d14fb64e6f 100644
--- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
+++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
@@ -38,9 +38,9 @@
 
 #include <projectexplorer/project.h>
 
-#include <clangbackendipc/cmbregisterprojectsforeditormessage.h>
-#include <clangbackendipc/filecontainer.h>
-#include <clangbackendipc/projectpartcontainer.h>
+#include <clangsupport/cmbregisterprojectsforeditormessage.h>
+#include <clangsupport/filecontainer.h>
+#include <clangsupport/projectpartcontainer.h>
 #include <utils/qtcassert.h>
 
 #include <QCoreApplication>
diff --git a/src/plugins/clangcodemodel/clangtextmark.h b/src/plugins/clangcodemodel/clangtextmark.h
index ae5478168a..5c794d970c 100644
--- a/src/plugins/clangcodemodel/clangtextmark.h
+++ b/src/plugins/clangcodemodel/clangtextmark.h
@@ -25,8 +25,8 @@
 
 #pragma once
 
-#include <clangbackendipc_global.h>
-#include <clangbackendipc/diagnosticcontainer.h>
+#include <clangsupport_global.h>
+#include <clangsupport/diagnosticcontainer.h>
 
 #include <texteditor/textmark.h>
 
diff --git a/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp b/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
index ac5d09ec3f..db09aea672 100644
--- a/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
+++ b/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
@@ -44,7 +44,7 @@
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditor.h>
 
-#include <clangbackendipc/clangcodemodelservermessages.h>
+#include <clangsupport/clangcodemodelservermessages.h>
 
 #include <utils/changeset.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/clangpchmanager/clangpchmanager_dependencies.pri b/src/plugins/clangpchmanager/clangpchmanager_dependencies.pri
index 281eca80d5..197da5a97c 100644
--- a/src/plugins/clangpchmanager/clangpchmanager_dependencies.pri
+++ b/src/plugins/clangpchmanager/clangpchmanager_dependencies.pri
@@ -1,7 +1,7 @@
 QTC_PLUGIN_NAME = ClangPchManager
 QTC_LIB_DEPENDS += \
     utils \
-    clangbackendipc
+    clangsupport
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
     cpptools
diff --git a/src/plugins/clangrefactoring/clangrefactoring_dependencies.pri b/src/plugins/clangrefactoring/clangrefactoring_dependencies.pri
index 15005bd689..ed775ae4fc 100644
--- a/src/plugins/clangrefactoring/clangrefactoring_dependencies.pri
+++ b/src/plugins/clangrefactoring/clangrefactoring_dependencies.pri
@@ -1,7 +1,7 @@
 QTC_PLUGIN_NAME = ClangRefactoring
 QTC_LIB_DEPENDS += \
     utils \
-    clangbackendipc
+    clangsupport
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
     cpptools \
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index c20d46ed40..1c68cf5ab5 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -38,7 +38,7 @@
 #include "cppquickfixassistant.h"
 #include "cppuseselectionsupdater.h"
 
-#include <clangbackendipc/sourcelocationscontainer.h>
+#include <clangsupport/sourcelocationscontainer.h>
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
diff --git a/src/plugins/cpptools/refactoringengineinterface.h b/src/plugins/cpptools/refactoringengineinterface.h
index 2076a379d8..4afecb7a24 100644
--- a/src/plugins/cpptools/refactoringengineinterface.h
+++ b/src/plugins/cpptools/refactoringengineinterface.h
@@ -27,8 +27,8 @@
 
 #include <utils/fileutils.h>
 
-#include <clangbackendipc/sourcelocationscontainer.h>
-#include <clangbackendipc/refactoringclientinterface.h>
+#include <clangsupport/sourcelocationscontainer.h>
+#include <clangsupport/refactoringclientinterface.h>
 
 QT_BEGIN_NAMESPACE
 class QTextCursor;
diff --git a/src/tools/clangbackend/clangbackend.pro b/src/tools/clangbackend/clangbackend.pro
index f75775c8e7..b17d923a3b 100644
--- a/src/tools/clangbackend/clangbackend.pro
+++ b/src/tools/clangbackend/clangbackend.pro
@@ -1,6 +1,6 @@
 QTC_LIB_DEPENDS += \
     sqlite \
-    clangbackendipc
+    clangsupport
 
 include(../../qtcreatortool.pri)
 include(../../shared/clang/clang_installation.pri)
diff --git a/src/tools/clangbackend/clangbackend.qbs b/src/tools/clangbackend/clangbackend.qbs
index 457c218501..4a1ca11579 100644
--- a/src/tools/clangbackend/clangbackend.qbs
+++ b/src/tools/clangbackend/clangbackend.qbs
@@ -3,7 +3,7 @@ import qbs 1.0
 QtcTool {
     name: "clangbackend"
 
-    Depends { name: "ClangBackEndIpc" }
+    Depends { name: "ClangSupport" }
     Depends { name: "libclang"; required: false }
 
     Group {
diff --git a/src/tools/clangbackend/ipcsource/clangcodemodelserver.cpp b/src/tools/clangbackend/ipcsource/clangcodemodelserver.cpp
index 5f07f99a06..4c5f3712eb 100644
--- a/src/tools/clangbackend/ipcsource/clangcodemodelserver.cpp
+++ b/src/tools/clangbackend/ipcsource/clangcodemodelserver.cpp
@@ -35,8 +35,8 @@
 #include "clangexceptions.h"
 #include "skippedsourceranges.h"
 
-#include <clangbackendipc/clangbackendipcdebugutils.h>
-#include <clangbackendipc/clangcodemodelservermessages.h>
+#include <clangsupport/clangsupportdebugutils.h>
+#include <clangsupport/clangcodemodelservermessages.h>
 
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
diff --git a/src/tools/clangbackend/ipcsource/clangcompletecodejob.cpp b/src/tools/clangbackend/ipcsource/clangcompletecodejob.cpp
index d45f53fdda..24378b201c 100644
--- a/src/tools/clangbackend/ipcsource/clangcompletecodejob.cpp
+++ b/src/tools/clangbackend/ipcsource/clangcompletecodejob.cpp
@@ -25,9 +25,9 @@
 
 #include "clangcompletecodejob.h"
 
-#include <clangbackendipc/clangbackendipcdebugutils.h>
-#include <clangbackendipc/clangcodemodelclientinterface.h>
-#include <clangbackendipc/cmbcodecompletedmessage.h>
+#include <clangsupport/clangsupportdebugutils.h>
+#include <clangsupport/clangcodemodelclientinterface.h>
+#include <clangsupport/cmbcodecompletedmessage.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/tools/clangbackend/ipcsource/clangcompletecodejob.h b/src/tools/clangbackend/ipcsource/clangcompletecodejob.h
index 142988d740..54b0ae5ec3 100644
--- a/src/tools/clangbackend/ipcsource/clangcompletecodejob.h
+++ b/src/tools/clangbackend/ipcsource/clangcompletecodejob.h
@@ -28,7 +28,7 @@
 #include "clangasyncjob.h"
 #include "clangdocument.h"
 
-#include <clangbackendipc/codecompletion.h>
+#include <clangsupport/codecompletion.h>
 
 namespace ClangBackEnd {
 
diff --git a/src/tools/clangbackend/ipcsource/clangcreateinitialdocumentpreamblejob.cpp b/src/tools/clangbackend/ipcsource/clangcreateinitialdocumentpreamblejob.cpp
index a9bf669866..62ae318f61 100644
--- a/src/tools/clangbackend/ipcsource/clangcreateinitialdocumentpreamblejob.cpp
+++ b/src/tools/clangbackend/ipcsource/clangcreateinitialdocumentpreamblejob.cpp
@@ -25,7 +25,7 @@
 
 #include "clangcreateinitialdocumentpreamblejob.h"
 
-#include <clangbackendipc/clangbackendipcdebugutils.h>
+#include <clangsupport/clangsupportdebugutils.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/tools/clangbackend/ipcsource/clangdocumentsuspenderresumer.cpp b/src/tools/clangbackend/ipcsource/clangdocumentsuspenderresumer.cpp
index bae9889318..cd0e29b5d0 100644
--- a/src/tools/clangbackend/ipcsource/clangdocumentsuspenderresumer.cpp
+++ b/src/tools/clangbackend/ipcsource/clangdocumentsuspenderresumer.cpp
@@ -25,7 +25,7 @@
 
 #include "clangdocumentsuspenderresumer.h"
 
-#include "clangbackendipc_global.h"
+#include "clangsupport_global.h"
 #include "clangdocumentprocessors.h"
 #include "clangdocuments.h"
 
diff --git a/src/tools/clangbackend/ipcsource/clangfollowsymbol.cpp b/src/tools/clangbackend/ipcsource/clangfollowsymbol.cpp
index b4d3fdb333..7074af52ee 100644
--- a/src/tools/clangbackend/ipcsource/clangfollowsymbol.cpp
+++ b/src/tools/clangbackend/ipcsource/clangfollowsymbol.cpp
@@ -29,7 +29,7 @@
 #include "cursor.h"
 #include "clangstring.h"
 #include "sourcerange.h"
-#include "clangbackendipcdebugutils.h"
+#include "clangsupportdebugutils.h"
 
 #include <utils/qtcassert.h>
 
diff --git a/src/tools/clangbackend/ipcsource/clangfollowsymboljob.cpp b/src/tools/clangbackend/ipcsource/clangfollowsymboljob.cpp
index ffac66b65f..2a04be1b0e 100644
--- a/src/tools/clangbackend/ipcsource/clangfollowsymboljob.cpp
+++ b/src/tools/clangbackend/ipcsource/clangfollowsymboljob.cpp
@@ -25,9 +25,9 @@
 
 #include "clangfollowsymboljob.h"
 
-#include <clangbackendipc/clangbackendipcdebugutils.h>
-#include <clangbackendipc/followsymbolmessage.h>
-#include <clangbackendipc/clangcodemodelclientinterface.h>
+#include <clangsupport/clangsupportdebugutils.h>
+#include <clangsupport/followsymbolmessage.h>
+#include <clangsupport/clangcodemodelclientinterface.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/tools/clangbackend/ipcsource/clangfollowsymboljob.h b/src/tools/clangbackend/ipcsource/clangfollowsymboljob.h
index 2d56e2ca10..ce2ca4e06c 100644
--- a/src/tools/clangbackend/ipcsource/clangfollowsymboljob.h
+++ b/src/tools/clangbackend/ipcsource/clangfollowsymboljob.h
@@ -28,7 +28,7 @@
 #include "clangasyncjob.h"
 #include "clangdocument.h"
 
-#include <clangbackendipc/sourcerangecontainer.h>
+#include <clangsupport/sourcerangecontainer.h>
 
 namespace ClangBackEnd {
 
diff --git a/src/tools/clangbackend/ipcsource/clangjobs.h b/src/tools/clangbackend/ipcsource/clangjobs.h
index c4167110f5..d154d401e8 100644
--- a/src/tools/clangbackend/ipcsource/clangjobs.h
+++ b/src/tools/clangbackend/ipcsource/clangjobs.h
@@ -27,7 +27,7 @@
 
 #include "clangjobqueue.h"
 
-#include <clangbackendipc/clangcodemodelclientinterface.h>
+#include <clangsupport/clangcodemodelclientinterface.h>
 
 #include <QFuture>
 
diff --git a/src/tools/clangbackend/ipcsource/clangparsesupportivetranslationunitjob.cpp b/src/tools/clangbackend/ipcsource/clangparsesupportivetranslationunitjob.cpp
index fa8937c195..c7646f5834 100644
--- a/src/tools/clangbackend/ipcsource/clangparsesupportivetranslationunitjob.cpp
+++ b/src/tools/clangbackend/ipcsource/clangparsesupportivetranslationunitjob.cpp
@@ -25,7 +25,7 @@
 
 #include "clangparsesupportivetranslationunitjob.h"
 
-#include <clangbackendipc/clangbackendipcdebugutils.h>
+#include <clangsupport/clangsupportdebugutils.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/tools/clangbackend/ipcsource/clangreferencescollector.cpp b/src/tools/clangbackend/ipcsource/clangreferencescollector.cpp
index df9d937de0..d2b7bf5431 100644
--- a/src/tools/clangbackend/ipcsource/clangreferencescollector.cpp
+++ b/src/tools/clangbackend/ipcsource/clangreferencescollector.cpp
@@ -29,7 +29,7 @@
 #include "cursor.h"
 #include "sourcerange.h"
 
-#include <clangbackendipc/sourcerangecontainer.h>
+#include <clangsupport/sourcerangecontainer.h>
 #include <utils/qtcassert.h>
 
 #include <utf8string.h>
diff --git a/src/tools/clangbackend/ipcsource/clangreferencescollector.h b/src/tools/clangbackend/ipcsource/clangreferencescollector.h
index 6feee77c79..263ba07fd9 100644
--- a/src/tools/clangbackend/ipcsource/clangreferencescollector.h
+++ b/src/tools/clangbackend/ipcsource/clangreferencescollector.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <clangbackendipc/sourcerangecontainer.h>
+#include <clangsupport/sourcerangecontainer.h>
 
 #include <QVector>
 
diff --git a/src/tools/clangbackend/ipcsource/clangreparsesupportivetranslationunitjob.cpp b/src/tools/clangbackend/ipcsource/clangreparsesupportivetranslationunitjob.cpp
index da922db8e9..833b8fe2b9 100644
--- a/src/tools/clangbackend/ipcsource/clangreparsesupportivetranslationunitjob.cpp
+++ b/src/tools/clangbackend/ipcsource/clangreparsesupportivetranslationunitjob.cpp
@@ -25,7 +25,7 @@
 
 #include "clangreparsesupportivetranslationunitjob.h"
 
-#include <clangbackendipc/clangbackendipcdebugutils.h>
+#include <clangsupport/clangsupportdebugutils.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/tools/clangbackend/ipcsource/clangrequestdocumentannotationsjob.cpp b/src/tools/clangbackend/ipcsource/clangrequestdocumentannotationsjob.cpp
index 45b06c0203..f0f7f78210 100644
--- a/src/tools/clangbackend/ipcsource/clangrequestdocumentannotationsjob.cpp
+++ b/src/tools/clangbackend/ipcsource/clangrequestdocumentannotationsjob.cpp
@@ -25,9 +25,9 @@
 
 #include "clangrequestdocumentannotationsjob.h"
 
-#include <clangbackendipc/clangbackendipcdebugutils.h>
-#include <clangbackendipc/documentannotationschangedmessage.h>
-#include <clangbackendipc/clangcodemodelclientinterface.h>
+#include <clangsupport/clangsupportdebugutils.h>
+#include <clangsupport/documentannotationschangedmessage.h>
+#include <clangsupport/clangcodemodelclientinterface.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/tools/clangbackend/ipcsource/clangrequestdocumentannotationsjob.h b/src/tools/clangbackend/ipcsource/clangrequestdocumentannotationsjob.h
index e6bb4f9edc..dcbe42b6e4 100644
--- a/src/tools/clangbackend/ipcsource/clangrequestdocumentannotationsjob.h
+++ b/src/tools/clangbackend/ipcsource/clangrequestdocumentannotationsjob.h
@@ -28,9 +28,9 @@
 #include "clangasyncjob.h"
 #include "clangdocument.h"
 
-#include <clangbackendipc/diagnosticcontainer.h>
-#include <clangbackendipc/highlightingmarkcontainer.h>
-#include <clangbackendipc/sourcerangecontainer.h>
+#include <clangsupport/diagnosticcontainer.h>
+#include <clangsupport/highlightingmarkcontainer.h>
+#include <clangsupport/sourcerangecontainer.h>
 
 namespace ClangBackEnd {
 
diff --git a/src/tools/clangbackend/ipcsource/clangrequestreferencesjob.cpp b/src/tools/clangbackend/ipcsource/clangrequestreferencesjob.cpp
index f80072c0ed..1ebc22c971 100644
--- a/src/tools/clangbackend/ipcsource/clangrequestreferencesjob.cpp
+++ b/src/tools/clangbackend/ipcsource/clangrequestreferencesjob.cpp
@@ -25,9 +25,9 @@
 
 #include "clangrequestreferencesjob.h"
 
-#include <clangbackendipc/clangbackendipcdebugutils.h>
-#include <clangbackendipc/referencesmessage.h>
-#include <clangbackendipc/clangcodemodelclientinterface.h>
+#include <clangsupport/clangsupportdebugutils.h>
+#include <clangsupport/referencesmessage.h>
+#include <clangsupport/clangcodemodelclientinterface.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/tools/clangbackend/ipcsource/clangrequestreferencesjob.h b/src/tools/clangbackend/ipcsource/clangrequestreferencesjob.h
index 179f8b845b..13a904bddc 100644
--- a/src/tools/clangbackend/ipcsource/clangrequestreferencesjob.h
+++ b/src/tools/clangbackend/ipcsource/clangrequestreferencesjob.h
@@ -29,7 +29,7 @@
 #include "clangreferencescollector.h"
 #include "clangdocument.h"
 
-#include <clangbackendipc/sourcerangecontainer.h>
+#include <clangsupport/sourcerangecontainer.h>
 
 namespace ClangBackEnd {
 
diff --git a/src/tools/clangbackend/ipcsource/clangsuspenddocumentjob.cpp b/src/tools/clangbackend/ipcsource/clangsuspenddocumentjob.cpp
index e3406fcf32..0e71813ba2 100644
--- a/src/tools/clangbackend/ipcsource/clangsuspenddocumentjob.cpp
+++ b/src/tools/clangbackend/ipcsource/clangsuspenddocumentjob.cpp
@@ -25,7 +25,7 @@
 
 #include "clangsuspenddocumentjob.h"
 
-#include <clangbackendipc/clangbackendipcdebugutils.h>
+#include <clangsupport/clangsupportdebugutils.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/tools/clangbackend/ipcsource/clangtranslationunit.h b/src/tools/clangbackend/ipcsource/clangtranslationunit.h
index 8bb317a8cd..9553138c99 100644
--- a/src/tools/clangbackend/ipcsource/clangtranslationunit.h
+++ b/src/tools/clangbackend/ipcsource/clangtranslationunit.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <clangbackendipc/codecompletion.h>
+#include <clangsupport/codecompletion.h>
 
 #include <clang-c/Index.h>
 
diff --git a/src/tools/clangbackend/ipcsource/clangupdatedocumentannotationsjob.cpp b/src/tools/clangbackend/ipcsource/clangupdatedocumentannotationsjob.cpp
index b4b56fe534..3698d1c40c 100644
--- a/src/tools/clangbackend/ipcsource/clangupdatedocumentannotationsjob.cpp
+++ b/src/tools/clangbackend/ipcsource/clangupdatedocumentannotationsjob.cpp
@@ -25,9 +25,9 @@
 
 #include "clangupdatedocumentannotationsjob.h"
 
-#include <clangbackendipc/clangbackendipcdebugutils.h>
-#include <clangbackendipc/clangcodemodelclientinterface.h>
-#include <clangbackendipc/documentannotationschangedmessage.h>
+#include <clangsupport/clangsupportdebugutils.h>
+#include <clangsupport/clangcodemodelclientinterface.h>
+#include <clangsupport/documentannotationschangedmessage.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/tools/clangbackend/ipcsource/clangupdatedocumentannotationsjob.h b/src/tools/clangbackend/ipcsource/clangupdatedocumentannotationsjob.h
index fdbe9068a6..a49e9b45b5 100644
--- a/src/tools/clangbackend/ipcsource/clangupdatedocumentannotationsjob.h
+++ b/src/tools/clangbackend/ipcsource/clangupdatedocumentannotationsjob.h
@@ -29,9 +29,9 @@
 #include "clangdocument.h"
 #include "clangtranslationunitupdater.h"
 
-#include <clangbackendipc/diagnosticcontainer.h>
-#include <clangbackendipc/highlightingmarkcontainer.h>
-#include <clangbackendipc/sourcerangecontainer.h>
+#include <clangsupport/diagnosticcontainer.h>
+#include <clangsupport/highlightingmarkcontainer.h>
+#include <clangsupport/sourcerangecontainer.h>
 
 namespace ClangBackEnd {
 
diff --git a/src/tools/clangbackend/ipcsource/diagnostic.h b/src/tools/clangbackend/ipcsource/diagnostic.h
index 64d4eff9b7..140322931f 100644
--- a/src/tools/clangbackend/ipcsource/diagnostic.h
+++ b/src/tools/clangbackend/ipcsource/diagnostic.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <clangbackendipc_global.h>
+#include <clangsupport_global.h>
 
 #include <clang-c/Index.h>
 
diff --git a/src/tools/clangbackend/ipcsource/highlightingmark.h b/src/tools/clangbackend/ipcsource/highlightingmark.h
index a749a5c922..151bd263d2 100644
--- a/src/tools/clangbackend/ipcsource/highlightingmark.h
+++ b/src/tools/clangbackend/ipcsource/highlightingmark.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <clangbackendipc_global.h>
+#include <clangsupport_global.h>
 #include <highlightingmarkcontainer.h>
 
 #include "cursor.h"
diff --git a/src/tools/clangpchmanagerbackend/clangpchmanagerbackend.pro b/src/tools/clangpchmanagerbackend/clangpchmanagerbackend.pro
index b115782dfe..8dab349dd3 100644
--- a/src/tools/clangpchmanagerbackend/clangpchmanagerbackend.pro
+++ b/src/tools/clangpchmanagerbackend/clangpchmanagerbackend.pro
@@ -1,5 +1,5 @@
 QTC_LIB_DEPENDS += \
-    clangbackendipc
+    clangsupport
 
 include(../../qtcreatortool.pri)
 include(../../shared/clang/clang_installation.pri)
diff --git a/src/tools/clangrefactoringbackend/clangrefactoringbackend.pro b/src/tools/clangrefactoringbackend/clangrefactoringbackend.pro
index 705198f216..3b94d003c0 100644
--- a/src/tools/clangrefactoringbackend/clangrefactoringbackend.pro
+++ b/src/tools/clangrefactoringbackend/clangrefactoringbackend.pro
@@ -1,5 +1,5 @@
 QTC_LIB_DEPENDS += \
-    clangbackendipc
+    clangsupport
 
 include(../../qtcreatortool.pri)
 include(../../shared/clang/clang_installation.pri)
diff --git a/tests/unit/echoserver/echoclangcodemodelserver.cpp b/tests/unit/echoserver/echoclangcodemodelserver.cpp
index c4a761b19f..b5de4ba539 100644
--- a/tests/unit/echoserver/echoclangcodemodelserver.cpp
+++ b/tests/unit/echoserver/echoclangcodemodelserver.cpp
@@ -25,8 +25,8 @@
 
 #include "echoclangcodemodelserver.h"
 
-#include <clangbackendipc/clangcodemodelservermessages.h>
-#include <clangbackendipc/connectionserver.h>
+#include <clangsupport/clangcodemodelservermessages.h>
+#include <clangsupport/connectionserver.h>
 
 #include <QCoreApplication>
 #include <QDebug>
diff --git a/tests/unit/echoserver/echoclangcodemodelserver.h b/tests/unit/echoserver/echoclangcodemodelserver.h
index 7704283d5b..2dc8c30913 100644
--- a/tests/unit/echoserver/echoclangcodemodelserver.h
+++ b/tests/unit/echoserver/echoclangcodemodelserver.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <clangbackendipc/clangcodemodelserverinterface.h>
+#include <clangsupport/clangcodemodelserverinterface.h>
 #include <ipcclientprovider.h>
 
 namespace ClangBackEnd {
diff --git a/tests/unit/echoserver/echoserver.pro b/tests/unit/echoserver/echoserver.pro
index 0f9ed76afa..38d0ff2078 100644
--- a/tests/unit/echoserver/echoserver.pro
+++ b/tests/unit/echoserver/echoserver.pro
@@ -15,7 +15,7 @@ IDE_BIN_PATH=$$PWD
 include($$PWD/../../../src/libs/utils/utils-lib.pri)
 
 include(../../../qtcreator.pri)
-include(../../../src/libs/clangbackendipc/clangbackendipc-lib.pri)
+include(../../../src/libs/clangsupport/clangsupport-lib.pri)
 include(../../../src/libs/sqlite/sqlite-lib.pri)
 
 INCLUDEPATH += ../../../src/libs
@@ -27,7 +27,7 @@ SOURCES += \
 HEADERS += \
     echoclangcodemodelserver.h
 
-DEFINES += CLANGBACKENDIPC_TESTS
+DEFINES += CLANGSUPPORT_TESTS
 DEFINES += DONT_CHECK_MESSAGE_COUNTER
 
 win32:DESTDIR = ..
diff --git a/tests/unit/echoserver/echoserverprocessmain.cpp b/tests/unit/echoserver/echoserverprocessmain.cpp
index a627c11fae..a153feaf15 100644
--- a/tests/unit/echoserver/echoserverprocessmain.cpp
+++ b/tests/unit/echoserver/echoserverprocessmain.cpp
@@ -25,8 +25,8 @@
 
 #include "echoclangcodemodelserver.h"
 
-#include <clangbackendipc/clangcodemodelclientproxy.h>
-#include <clangbackendipc/connectionserver.h>
+#include <clangsupport/clangcodemodelclientproxy.h>
+#include <clangsupport/connectionserver.h>
 
 #include <QCoreApplication>
 
diff --git a/tests/unit/unittest/clangasyncjob-base.cpp b/tests/unit/unittest/clangasyncjob-base.cpp
index c3695d9639..81593c9ac3 100644
--- a/tests/unit/unittest/clangasyncjob-base.cpp
+++ b/tests/unit/unittest/clangasyncjob-base.cpp
@@ -26,7 +26,7 @@
 #include "clangasyncjob-base.h"
 #include "processevents-utilities.h"
 
-#include <clangbackendipc/filecontainer.h>
+#include <clangsupport/filecontainer.h>
 
 using namespace ClangBackEnd;
 
diff --git a/tests/unit/unittest/clangfollowsymbol-test.cpp b/tests/unit/unittest/clangfollowsymbol-test.cpp
index 7346e31c25..64023116fb 100644
--- a/tests/unit/unittest/clangfollowsymbol-test.cpp
+++ b/tests/unit/unittest/clangfollowsymbol-test.cpp
@@ -26,7 +26,7 @@
 #include "googletest.h"
 #include "testenvironment.h"
 
-#include <clangbackendipc_global.h>
+#include <clangsupport_global.h>
 #include <clangfollowsymboljob.h>
 #include <clangdocument.h>
 #include <clangdocuments.h>
diff --git a/tests/unit/unittest/clangreferencescollector-test.cpp b/tests/unit/unittest/clangreferencescollector-test.cpp
index 7141ee2afb..4fae0785ea 100644
--- a/tests/unit/unittest/clangreferencescollector-test.cpp
+++ b/tests/unit/unittest/clangreferencescollector-test.cpp
@@ -26,7 +26,7 @@
 #include "googletest.h"
 #include "testenvironment.h"
 
-#include <clangbackendipc_global.h>
+#include <clangsupport_global.h>
 #include <clangreferencescollector.h>
 #include <clangdocument.h>
 #include <clangdocuments.h>
diff --git a/tests/unit/unittest/creator_dependency.pri b/tests/unit/unittest/creator_dependency.pri
index 1932640249..edf7417029 100644
--- a/tests/unit/unittest/creator_dependency.pri
+++ b/tests/unit/unittest/creator_dependency.pri
@@ -5,7 +5,7 @@ IDE_BIN_PATH=$$PWD
 include($$PWD/../../../src/libs/utils/utils-lib.pri)
 
 include($$PWD/../../../src/libs/sqlite/sqlite-lib.pri)
-include($$PWD/../../../src/libs/clangbackendipc/clangbackendipc-lib.pri)
+include($$PWD/../../../src/libs/clangsupport/clangsupport-lib.pri)
 include($$PWD/../../../src/plugins/coreplugin/corepluginunittestfiles.pri)
 include($$PWD/../../../src/tools/clangrefactoringbackend/source/clangrefactoringbackend-source.pri)
 include($$PWD/../../../src/tools/clangpchmanagerbackend/source/clangpchmanagerbackend-source.pri)
diff --git a/tests/unit/unittest/diagnosticset-test.cpp b/tests/unit/unittest/diagnosticset-test.cpp
index 007c8d2f5f..7f67e8c2ca 100644
--- a/tests/unit/unittest/diagnosticset-test.cpp
+++ b/tests/unit/unittest/diagnosticset-test.cpp
@@ -27,7 +27,7 @@
 #include "diagnosticcontainer-matcher.h"
 #include "testenvironment.h"
 
-#include <clangbackendipc_global.h>
+#include <clangsupport_global.h>
 #include <clangdocument.h>
 #include <diagnosticcontainer.h>
 #include <diagnosticset.h>
diff --git a/tests/unit/unittest/highlightingmarks-test.cpp b/tests/unit/unittest/highlightingmarks-test.cpp
index cbedd9d844..16c7bc59e6 100644
--- a/tests/unit/unittest/highlightingmarks-test.cpp
+++ b/tests/unit/unittest/highlightingmarks-test.cpp
@@ -30,7 +30,7 @@
 #include <clangdocuments.h>
 #include <clangtranslationunit.h>
 #include <cursor.h>
-#include <clangbackendipc_global.h>
+#include <clangsupport_global.h>
 #include <clangstring.h>
 #include <projectpart.h>
 #include <projects.h>
diff --git a/tests/unit/unittest/mockclangcodemodelclient.h b/tests/unit/unittest/mockclangcodemodelclient.h
index 4428337852..47da03e33d 100644
--- a/tests/unit/unittest/mockclangcodemodelclient.h
+++ b/tests/unit/unittest/mockclangcodemodelclient.h
@@ -27,8 +27,8 @@
 
 #include "googletest.h"
 
-#include <clangbackendipc/clangcodemodelclientinterface.h>
-#include <clangbackendipc/clangcodemodelclientmessages.h>
+#include <clangsupport/clangcodemodelclientinterface.h>
+#include <clangsupport/clangcodemodelclientmessages.h>
 
 class MockClangCodeModelClient : public ClangBackEnd::ClangCodeModelClientInterface
 {
author	Marco Bubke <marco.bubke@qt.io>	2017-08-24 12:28:01 +0200
committer	Marco Bubke <marco.bubke@qt.io>	2017-08-29 16:36:35 +0000
commit	7c0331ab93ff6096a2b7742688e171ddc99ed269 (patch)
tree	bed9561852d24f84fc734bc2bc4d11e76ecd4a31
parent	46ba29b8c05e05af355caed68f0988f9fbd8a8d0 (diff)
download	qt-creator-7c0331ab93ff6096a2b7742688e171ddc99ed269.tar.gz