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