blob: 12c46c89ed0e8b46e997af39cfff3106d507b0ab (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
--- 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 {
--- 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>
--- 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>
--- a/src/plugins/clangformat/clangformatutils.h
+++ b/src/plugins/clangformat/clangformatutils.h
@@ -27,7 +27,7 @@
#include <coreplugin/id.h>
#include <utils/fileutils.h>
-#include <clang/Format/Format.h>
+#include <clang/Format/FormatIDE.h>
#include <QFile>
--- a/src/shared/clang/clang_installation.pri
+++ b/src/shared/clang/clang_installation.pri
@@ -227,7 +227,7 @@
CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h
exists($$CLANGFORMAT_MAIN_HEADER) {
exists($${LLVM_LIBDIR}/libclangFormat.so*)|exists($${LLVM_LIBDIR}/libclangFormat.dylib) {
- 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 \
@@ -235,7 +235,7 @@
win32:CLANGFORMAT_LIBS += -lversion
win32:ALL_CLANG_LIBS += -lversion
} else {
- CLANGFORMAT_LIBS=-lclang-cpp
+ CLANGFORMAT_LIBS=-lclangFormatIDE -lclang-cpp
ALL_CLANG_LIBS=-lclang-cpp
}
}
|
GitWeb
