dev-qt/qt-creator/files/qt-creator-4.14.0-libclangformat-ide.patch
changeset 43 261f7eadb5ac
parent 42 abb6a36085ad
child 44 dc5b21d4b409
--- a/dev-qt/qt-creator/files/qt-creator-4.14.0-libclangformat-ide.patch	Sat Aug 07 16:31:38 2021 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-diff --git a/src/plugins/clangformat/clangformatbaseindenter.h b/src/plugins/clangformat/clangformatbaseindenter.h
-index 00dc3e9c..2c1cf48f 100644
---- a/src/plugins/clangformat/clangformatbaseindenter.h
-+++ b/src/plugins/clangformat/clangformatbaseindenter.h
-@@ -27,7 +27,7 @@
- 
- #include <texteditor/indenter.h>
- 
--#include <clang/Format/Format.h>
-+#include <clang/Format/FormatIDE.h>
- 
- namespace ClangFormat {
- 
-diff --git a/src/plugins/clangformat/clangformatconfigwidget.cpp b/src/plugins/clangformat/clangformatconfigwidget.cpp
-index f1fa2c82..b2e552e9 100644
---- a/src/plugins/clangformat/clangformatconfigwidget.cpp
-+++ b/src/plugins/clangformat/clangformatconfigwidget.cpp
-@@ -32,7 +32,7 @@
- #include "ui_clangformatchecks.h"
- #include "ui_clangformatconfigwidget.h"
- 
--#include <clang/Format/Format.h>
-+#include <clang/Format/FormatIDE.h>
- 
- #include <coreplugin/icore.h>
- #include <cppeditor/cpphighlighter.h>
-diff --git a/src/plugins/clangformat/clangformatplugin.cpp b/src/plugins/clangformat/clangformatplugin.cpp
-index 9b76a086..840efe1f 100644
---- a/src/plugins/clangformat/clangformatplugin.cpp
-+++ b/src/plugins/clangformat/clangformatplugin.cpp
-@@ -56,7 +56,7 @@
- #include <texteditor/icodestylepreferences.h>
- #include <texteditor/texteditorsettings.h>
- 
--#include <clang/Format/Format.h>
-+#include <clang/Format/FormatIDE.h>
- 
- #include <utils/algorithm.h>
- 
-diff --git a/src/plugins/clangformat/clangformatutils.h b/src/plugins/clangformat/clangformatutils.h
-index 74fd84c9..c455d25f 100644
---- a/src/plugins/clangformat/clangformatutils.h
-+++ b/src/plugins/clangformat/clangformatutils.h
-@@ -28,7 +28,7 @@
- #include <utils/fileutils.h>
- #include <utils/id.h>
- 
--#include <clang/Format/Format.h>
-+#include <clang/Format/FormatIDE.h>
- 
- #include <QFile>
- 
-diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri
-index 28c2d0d..52a5442 100644
---- a/src/shared/clang/clang_installation.pri
-+++ b/src/shared/clang/clang_installation.pri
-@@ -204,14 +204,14 @@ isEmpty(LLVM_VERSION) {
-         CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h
-         exists($$CLANGFORMAT_MAIN_HEADER) {
-             exists($$LLVM_LIBDIR/*clangBasic*) {
--                CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
-+                CLANGFORMAT_LIBS=-lclangFormatIDE -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
-                 win32:CLANGFORMAT_LIBS += -lversion
-             } else {
--                CLANGFORMAT_LIBS = -lclang-cpp
-+                CLANGFORMAT_LIBS = -lclangFormatIDE -lclang-cpp
-                 ALL_CLANG_LIBS = -lclang-cpp
-             }
-         }