dev-qt/qt-creator/files/qt-creator-4.14.0-libclangformat-ide.patch
changeset 43 261f7eadb5ac
parent 42 abb6a36085ad
child 44 dc5b21d4b409
equal deleted inserted replaced
42:abb6a36085ad 43:261f7eadb5ac
     1 diff --git a/src/plugins/clangformat/clangformatbaseindenter.h b/src/plugins/clangformat/clangformatbaseindenter.h
       
     2 index 00dc3e9c..2c1cf48f 100644
       
     3 --- a/src/plugins/clangformat/clangformatbaseindenter.h
       
     4 +++ b/src/plugins/clangformat/clangformatbaseindenter.h
       
     5 @@ -27,7 +27,7 @@
       
     6  
       
     7  #include <texteditor/indenter.h>
       
     8  
       
     9 -#include <clang/Format/Format.h>
       
    10 +#include <clang/Format/FormatIDE.h>
       
    11  
       
    12  namespace ClangFormat {
       
    13  
       
    14 diff --git a/src/plugins/clangformat/clangformatconfigwidget.cpp b/src/plugins/clangformat/clangformatconfigwidget.cpp
       
    15 index f1fa2c82..b2e552e9 100644
       
    16 --- a/src/plugins/clangformat/clangformatconfigwidget.cpp
       
    17 +++ b/src/plugins/clangformat/clangformatconfigwidget.cpp
       
    18 @@ -32,7 +32,7 @@
       
    19  #include "ui_clangformatchecks.h"
       
    20  #include "ui_clangformatconfigwidget.h"
       
    21  
       
    22 -#include <clang/Format/Format.h>
       
    23 +#include <clang/Format/FormatIDE.h>
       
    24  
       
    25  #include <coreplugin/icore.h>
       
    26  #include <cppeditor/cpphighlighter.h>
       
    27 diff --git a/src/plugins/clangformat/clangformatplugin.cpp b/src/plugins/clangformat/clangformatplugin.cpp
       
    28 index 9b76a086..840efe1f 100644
       
    29 --- a/src/plugins/clangformat/clangformatplugin.cpp
       
    30 +++ b/src/plugins/clangformat/clangformatplugin.cpp
       
    31 @@ -56,7 +56,7 @@
       
    32  #include <texteditor/icodestylepreferences.h>
       
    33  #include <texteditor/texteditorsettings.h>
       
    34  
       
    35 -#include <clang/Format/Format.h>
       
    36 +#include <clang/Format/FormatIDE.h>
       
    37  
       
    38  #include <utils/algorithm.h>
       
    39  
       
    40 diff --git a/src/plugins/clangformat/clangformatutils.h b/src/plugins/clangformat/clangformatutils.h
       
    41 index 74fd84c9..c455d25f 100644
       
    42 --- a/src/plugins/clangformat/clangformatutils.h
       
    43 +++ b/src/plugins/clangformat/clangformatutils.h
       
    44 @@ -28,7 +28,7 @@
       
    45  #include <utils/fileutils.h>
       
    46  #include <utils/id.h>
       
    47  
       
    48 -#include <clang/Format/Format.h>
       
    49 +#include <clang/Format/FormatIDE.h>
       
    50  
       
    51  #include <QFile>
       
    52  
       
    53 diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri
       
    54 index 28c2d0d..52a5442 100644
       
    55 --- a/src/shared/clang/clang_installation.pri
       
    56 +++ b/src/shared/clang/clang_installation.pri
       
    57 @@ -204,14 +204,14 @@ isEmpty(LLVM_VERSION) {
       
    58          CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h
       
    59          exists($$CLANGFORMAT_MAIN_HEADER) {
       
    60              exists($$LLVM_LIBDIR/*clangBasic*) {
       
    61 -                CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
       
    62 +                CLANGFORMAT_LIBS=-lclangFormatIDE -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
       
    63                  ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \
       
    64                                 -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \
       
    65                                 -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \
       
    66                                 -lclangASTMatchers -lclangAST -lclangLex -lclangBasic
       
    67                  win32:CLANGFORMAT_LIBS += -lversion
       
    68              } else {
       
    69 -                CLANGFORMAT_LIBS = -lclang-cpp
       
    70 +                CLANGFORMAT_LIBS = -lclangFormatIDE -lclang-cpp
       
    71                  ALL_CLANG_LIBS = -lclang-cpp
       
    72              }
       
    73          }