Update libre/qtcreator to 4.12.0

Signed-off-by: Andreas Grapentin <andreas@grapentin.org>

4 files changed, 51 insertions, 332 deletions

diff --git a/libre/qtcreator/PKGBUILD b/libre/qtcreator/PKGBUILD
index 290601831..cf1baba33 100644
--- a/libre/qtcreator/PKGBUILD
+++ b/libre/qtcreator/PKGBUILD
@@ -14,9 +14,9 @@
 #  - removed support for qt5-webengine
 
 pkgname=qtcreator
-pkgver=4.11.2
+pkgver=4.12.0
 _clangver=10.0.0
-pkgrel=4
+pkgrel=2
 pkgrel+=.parabola1
 pkgdesc='Lightweight, cross-platform integrated development environment'
 pkgdesc+=', without nonfree qt5-webengine help viewer'
@@ -40,14 +40,12 @@ optdepends=('qt5-doc: integrated Qt documentation'
             'perf: performer analyzer')
 source=("https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz"
         qtcreator-preload-plugins.patch
-        qtcreator-clang-libs.patch
-        qtcreator-clang-10.patch::"https://code.qt.io/cgit/qt-creator/qt-creator.git/patch?id=44023c8f")
+        qtcreator-clang-libs.patch)
 source+=(libre.patch)
-sha256sums=('8d67e45b66944fdb0f879cbfae341af7e38d6a348cf18332b5cb9f07937aae02'
-            'd6f979c820e2294653f4f1853af96942bf25ff9fe9450657d45ff1c7f02bbca7'
-            '0f6d0dc41a87aae9ef371b1950f5b9d823db8b5685c6ac04a7a7ac133eb19a3f'
-            'cbbaa52f8daf40866c1c7157f168746cf7cb0231200feaeed05a0fb80e78c8ab')
-sha256sums+=('6aeac164075b7f3f3a2e9aa75865669beeeb7903b9cbb5b6a8700205b285fe64')
+sha256sums=('d76655799ad2af81fb15f85d412d74583659fb1b4cf27b758ad8aae73675948b'
+            'b40e222b30c355d1230160a4e933dbd161b8748125662e3bde312ea52296457a'
+            '0f6d0dc41a87aae9ef371b1950f5b9d823db8b5685c6ac04a7a7ac133eb19a3f')
+sha256sums+=('fb3bda8aca0637fb36122706ee06ba051dcda29a2f480ff3053b4ced1c009cc4')
 
 prepare() {
   mkdir -p build
@@ -64,7 +62,6 @@ prepare() {
   patch -p1 -i ../qtcreator-preload-plugins.patch
 
   # Fix build with clang 10
-  patch -p1 -i ../qtcreator-clang-10.patch
   patch -p1 -i ../qtcreator-clang-libs.patch
 
   # remove qt5-webengine support
diff --git a/libre/qtcreator/libre.patch b/libre/qtcreator/libre.patch
index ac04ccbf1..6b6a869e8 100644
--- a/libre/qtcreator/libre.patch
+++ b/libre/qtcreator/libre.patch
@@ -1,8 +1,8 @@
 diff --git a/src/plugins/help/CMakeLists.txt b/src/plugins/help/CMakeLists.txt
-index ac70c823..f6c34f3f 100644
+index a6711862..0eeea39c 100644
 --- a/src/plugins/help/CMakeLists.txt
 +++ b/src/plugins/help/CMakeLists.txt
-@@ -37,17 +37,6 @@ extend_qtc_plugin(Help
+@@ -36,17 +36,6 @@ extend_qtc_plugin(Help
      macwebkithelpviewer.mm
  )
  
@@ -21,12 +21,12 @@ index ac70c823..f6c34f3f 100644
    add_subdirectory(qlitehtml)
  else()
 diff --git a/src/plugins/help/help.pro b/src/plugins/help/help.pro
-index f4786112..8d20a4bc 100644
+index 7b58578e..c1627e89 100644
 --- a/src/plugins/help/help.pro
 +++ b/src/plugins/help/help.pro
-@@ -56,13 +56,6 @@ FORMS += docsettingspage.ui \
-     generalsettingspage.ui \
-     remotehelpfilter.ui
+@@ -53,13 +53,6 @@ FORMS += docsettingspage.ui \
+     filtersettingspage.ui \
+     generalsettingspage.ui
  
 -!isEmpty(QT.webenginewidgets.name) {
 -    QT += webenginewidgets
@@ -39,43 +39,42 @@ index f4786112..8d20a4bc 100644
      DEFINES += QTC_MAC_NATIVE_HELPVIEWER
      HEADERS += macwebkithelpviewer.h
 diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs
-index d1458d84..da915e52 100644
+index e1268e72..0abaa91f 100644
 --- a/src/plugins/help/help.qbs
 +++ b/src/plugins/help/help.qbs
-@@ -5,7 +5,6 @@ QtcPlugin {
+@@ -10,7 +10,6 @@ Project {
  
-     Depends { name: "Qt"; submodules: ["help", "network", "sql"]; }
-     Depends { name: "Qt.printsupport" }
--    Depends { name: "Qt.webenginewidgets"; required: false }
+         Depends { name: "Qt"; submodules: ["help", "network", "sql"]; }
+         Depends { name: "Qt.printsupport" }
+-        Depends { name: "Qt.webenginewidgets"; required: false }
  
-     Depends { name: "Aggregation" }
-     Depends { name: "Utils" }
-@@ -17,8 +16,6 @@ QtcPlugin {
+         Depends { name: "Aggregation" }
+         Depends { name: "Utils" }
+@@ -24,8 +23,6 @@ Project {
  
-     cpp.defines: {
-         var defines = base.concat(["QT_CLUCENE_SUPPORT"]);
--        if (Qt.webenginewidgets.present)
--            defines.push("QTC_WEBENGINE_HELPVIEWER");
-         return defines;
-     }
+         cpp.defines: {
+             var defines = base.concat(["QT_CLUCENE_SUPPORT"]);
+-            if (Qt.webenginewidgets.present)
+-                defines.push("QTC_WEBENGINE_HELPVIEWER");
+             if (qlitehtml.present)
+                 defines.push("QTC_LITEHTML_HELPVIEWER")
+             return defines;
+@@ -60,13 +57,6 @@ Project {
+             ]
+         }
  
-@@ -52,14 +49,6 @@ QtcPlugin {
-         ]
-     }
+-        Group {
+-            name: "WebEngine Sources"
+-            condition: Qt.webenginewidgets.present
+-            files: [
+-                "webenginehelpviewer.cpp", "webenginehelpviewer.h"
+-            ]
+-        }
  
--    Group {
--        name: "WebEngine Sources"
--        condition: Qt.webenginewidgets.present
--        files: [
--            "webenginehelpviewer.cpp", "webenginehelpviewer.h"
--        ]
--    }
--
-     Group {
-         id: sharedSources
-         name: "Shared Sources"
+         Group {
+             name: "litehtml-specific sources"
 diff --git a/src/plugins/help/localhelpmanager.cpp b/src/plugins/help/localhelpmanager.cpp
-index 8af763f4..cec1134e 100644
+index f8a02eb7..f993a192 100644
 --- a/src/plugins/help/localhelpmanager.cpp
 +++ b/src/plugins/help/localhelpmanager.cpp
 @@ -31,12 +31,6 @@
@@ -99,7 +98,7 @@ index 8af763f4..cec1134e 100644
  static const char kTextBrowserBackend[] = "textbrowser";
  
  static const int kDefaultFallbackFontSize = 14;
-@@ -315,29 +308,13 @@ HelpViewerFactory LocalHelpManager::defaultViewerBackend()
+@@ -318,29 +311,13 @@ HelpViewerFactory LocalHelpManager::defaultViewerBackend()
              return *factory;
      }
      if (!backend.isEmpty())
diff --git a/libre/qtcreator/qtcreator-clang-10.patch b/libre/qtcreator/qtcreator-clang-10.patch
deleted file mode 100644
index 553f5c004..000000000
--- a/libre/qtcreator/qtcreator-clang-10.patch
+++ /dev/null
@@ -1,277 +0,0 @@
-From 44023c8f43fd8daf8b7be305ea6d99b8b56fa551 Mon Sep 17 00:00:00 2001
-From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
-Date: Mon, 17 Feb 2020 23:21:17 +0200
-Subject: Clang: Fix build with Clang/LLVM 10
-
-Change-Id: I740286c9dcfd325b1c31ab863fb5c91bf9c6ec70
-Reviewed-by: hjk <hjk@qt.io>
----
- src/plugins/clangformat/clangformatutils.cpp       |  8 +++++++
- .../source/collectbuilddependencytoolaction.h      | 17 ++++++++++++-
- .../source/collectusedmacroactionfactory.h         | 12 ++++++++++
- .../source/generatepchactionfactory.h              |  7 ++++++
- .../clangrefactoringbackend/source/clangquery.cpp  |  3 ++-
- .../source/collectsymbolsaction.h                  |  6 ++++-
- .../source/indexdataconsumer.cpp                   | 28 +++++++++++++++-------
- .../source/indexdataconsumer.h                     | 28 +++++++++++++++-------
- .../source/symbolscollector.cpp                    |  4 ++++
- 9 files changed, 92 insertions(+), 21 deletions(-)
-
-diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp
-index f087f77a94..0a32d3a929 100644
---- a/src/plugins/clangformat/clangformatutils.cpp
-+++ b/src/plugins/clangformat/clangformatutils.cpp
-@@ -57,7 +57,11 @@ static clang::format::FormatStyle qtcStyle()
-     style.AlignOperands = true;
-     style.AlignTrailingComments = true;
-     style.AllowAllParametersOfDeclarationOnNextLine = true;
-+#if LLVM_VERSION_MAJOR >= 10
-+    style.AllowShortBlocksOnASingleLine = FormatStyle::SBS_Never;
-+#else
-     style.AllowShortBlocksOnASingleLine = false;
-+#endif
-     style.AllowShortCaseLabelsOnASingleLine = false;
-     style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline;
- #if LLVM_VERSION_MAJOR >= 9
-@@ -72,7 +76,11 @@ static clang::format::FormatStyle qtcStyle()
-     style.BinPackArguments = false;
-     style.BinPackParameters = false;
-     style.BraceWrapping.AfterClass = true;
-+#if LLVM_VERSION_MAJOR >= 10
-+    style.BraceWrapping.AfterControlStatement = FormatStyle::BWACS_Never;
-+#else
-     style.BraceWrapping.AfterControlStatement = false;
-+#endif
-     style.BraceWrapping.AfterEnum = false;
-     style.BraceWrapping.AfterFunction = true;
-     style.BraceWrapping.AfterNamespace = false;
-diff --git a/src/tools/clangpchmanagerbackend/source/collectbuilddependencytoolaction.h b/src/tools/clangpchmanagerbackend/source/collectbuilddependencytoolaction.h
-index 538f2c7d3f..88ed3d2344 100644
---- a/src/tools/clangpchmanagerbackend/source/collectbuilddependencytoolaction.h
-+++ b/src/tools/clangpchmanagerbackend/source/collectbuilddependencytoolaction.h
-@@ -60,6 +60,16 @@ public:
-                                                                     diagnosticConsumer);
-     }
- 
-+#if LLVM_VERSION_MAJOR >= 10
-+    std::unique_ptr<clang::FrontendAction> create() override
-+    {
-+        return std::make_unique<CollectBuildDependencyAction>(
-+                    m_buildDependency,
-+                    m_filePathCache,
-+                    m_excludedIncludeUIDs,
-+                    m_alreadyIncludedFileUIDs);
-+    }
-+#else
-     clang::FrontendAction *create() override
-     {
-         return new CollectBuildDependencyAction(m_buildDependency,
-@@ -67,6 +77,7 @@ public:
-                                                 m_excludedIncludeUIDs,
-                                                 m_alreadyIncludedFileUIDs);
-     }
-+#endif
- 
-     std::vector<uint> generateExcludedIncludeFileUIDs(clang::FileManager &fileManager) const
-     {
-@@ -77,7 +88,11 @@ public:
-             NativeFilePath nativeFilePath{filePath};
-             const clang::FileEntry *file = fileManager.getFile({nativeFilePath.path().data(),
-                                                                 nativeFilePath.path().size()},
--                                                               true);
-+                                                               true)
-+#if LLVM_VERSION_MAJOR >= 10
-+                    .get()
-+#endif
-+                    ;
- 
-             if (file)
-                 fileUIDs.push_back(file->getUID());
-diff --git a/src/tools/clangpchmanagerbackend/source/collectusedmacroactionfactory.h b/src/tools/clangpchmanagerbackend/source/collectusedmacroactionfactory.h
-index 423d5f8876..473b8e7df8 100644
---- a/src/tools/clangpchmanagerbackend/source/collectusedmacroactionfactory.h
-+++ b/src/tools/clangpchmanagerbackend/source/collectusedmacroactionfactory.h
-@@ -61,6 +61,17 @@ public:
-                                                                     diagnosticConsumer);
-     }
- 
-+#if LLVM_VERSION_MAJOR >= 10
-+    std::unique_ptr<clang::FrontendAction> create() override
-+    {
-+        return std::make_unique<CollectUsedMacrosAction>(
-+                    m_usedMacros,
-+                    m_filePathCache,
-+                    m_sourceDependencies,
-+                    m_sourceFiles,
-+                    m_fileStatuses);
-+    }
-+#else
-     clang::FrontendAction *create() override
-     {
-         return new CollectUsedMacrosAction(m_usedMacros,
-@@ -69,6 +80,7 @@ public:
-                                            m_sourceFiles,
-                                            m_fileStatuses);
-     }
-+#endif
- 
- private:
-     UsedMacros &m_usedMacros;
-diff --git a/src/tools/clangpchmanagerbackend/source/generatepchactionfactory.h b/src/tools/clangpchmanagerbackend/source/generatepchactionfactory.h
-index c4a8cae028..f1e4c74457 100644
---- a/src/tools/clangpchmanagerbackend/source/generatepchactionfactory.h
-+++ b/src/tools/clangpchmanagerbackend/source/generatepchactionfactory.h
-@@ -68,10 +68,17 @@ public:
-         , m_fileContent(fileContent)
-     {}
- 
-+#if LLVM_VERSION_MAJOR >= 10
-+    std::unique_ptr<clang::FrontendAction> create() override
-+    {
-+        return std::make_unique<GeneratePCHAction>(m_filePath, m_fileContent);
-+    }
-+#else
-     clang::FrontendAction *create() override
-     {
-         return new GeneratePCHAction{m_filePath, m_fileContent};
-     }
-+#endif
- 
- private:
-     llvm::StringRef m_filePath;
-diff --git a/src/tools/clangrefactoringbackend/source/clangquery.cpp b/src/tools/clangrefactoringbackend/source/clangquery.cpp
-index 21ebeb8367..78f2350d8d 100644
---- a/src/tools/clangrefactoringbackend/source/clangquery.cpp
-+++ b/src/tools/clangrefactoringbackend/source/clangquery.cpp
-@@ -78,7 +78,8 @@ void ClangQuery::findLocations()
-                    std::make_move_iterator(asts.end()),
-                    [&] (std::unique_ptr<clang::ASTUnit> &&ast) {
-         Diagnostics diagnostics;
--        auto optionalMatcher = Parser::parseMatcherExpression({m_query.data(), m_query.size()},
-+        llvm::StringRef query{m_query.data(), m_query.size()};
-+        auto optionalMatcher = Parser::parseMatcherExpression(query,
-                                                               nullptr,
-                                                               &diagnostics);
-         parseDiagnostics(diagnostics);
-diff --git a/src/tools/clangrefactoringbackend/source/collectsymbolsaction.h b/src/tools/clangrefactoringbackend/source/collectsymbolsaction.h
-index a38f1c4f87..4f36adadf5 100644
---- a/src/tools/clangrefactoringbackend/source/collectsymbolsaction.h
-+++ b/src/tools/clangrefactoringbackend/source/collectsymbolsaction.h
-@@ -48,7 +48,11 @@ class CollectSymbolsAction : public clang::WrapperFrontendAction
- public:
-     CollectSymbolsAction(std::shared_ptr<IndexDataConsumer> indexDataConsumer)
-         : clang::WrapperFrontendAction(
--            clang::index::createIndexingAction(indexDataConsumer, createIndexingOptions(), nullptr))
-+            clang::index::createIndexingAction(indexDataConsumer, createIndexingOptions()
-+#if LLVM_VERSION_MAJOR < 10
-+                                               , nullptr
-+#endif
-+                                               ))
-         , m_indexDataConsumer(indexDataConsumer)
-     {}
- 
-diff --git a/src/tools/clangrefactoringbackend/source/indexdataconsumer.cpp b/src/tools/clangrefactoringbackend/source/indexdataconsumer.cpp
-index e287144462..5d21b30b9c 100644
---- a/src/tools/clangrefactoringbackend/source/indexdataconsumer.cpp
-+++ b/src/tools/clangrefactoringbackend/source/indexdataconsumer.cpp
-@@ -118,11 +118,16 @@ bool IndexDataConsumer::isAlreadyParsed(clang::FileID fileId, SourcesManager &so
-     return sourcesManager.alreadyParsed(filePathId(fileEntry), fileEntry->getModificationTime());
- }
- 
--bool IndexDataConsumer::handleDeclOccurence(const clang::Decl *declaration,
--                                            clang::index::SymbolRoleSet symbolRoles,
--                                            llvm::ArrayRef<clang::index::SymbolRelation> /*symbolRelations*/,
--                                            clang::SourceLocation sourceLocation,
--                                            IndexDataConsumer::ASTNodeInfo /*astNodeInfo*/)
-+#if LLVM_VERSION_MAJOR >= 10
-+    bool IndexDataConsumer::handleDeclOccurrence(
-+#else
-+    bool IndexDataConsumer::handleDeclOccurence(
-+#endif
-+        const clang::Decl *declaration,
-+        clang::index::SymbolRoleSet symbolRoles,
-+        llvm::ArrayRef<clang::index::SymbolRelation> /*symbolRelations*/,
-+        clang::SourceLocation sourceLocation,
-+        IndexDataConsumer::ASTNodeInfo /*astNodeInfo*/)
- {
-     const auto *namedDeclaration = clang::dyn_cast<clang::NamedDecl>(declaration);
-     if (namedDeclaration) {
-@@ -175,10 +180,15 @@ SourceLocationKind macroSymbolType(clang::index::SymbolRoleSet roles)
- 
- } // namespace
- 
--bool IndexDataConsumer::handleMacroOccurence(const clang::IdentifierInfo *identifierInfo,
--                                             const clang::MacroInfo *macroInfo,
--                                             clang::index::SymbolRoleSet roles,
--                                             clang::SourceLocation sourceLocation)
-+#if LLVM_VERSION_MAJOR >= 10
-+bool IndexDataConsumer::handleMacroOccurrence(
-+#else
-+bool IndexDataConsumer::handleMacroOccurence(
-+#endif
-+        const clang::IdentifierInfo *identifierInfo,
-+        const clang::MacroInfo *macroInfo,
-+        clang::index::SymbolRoleSet roles,
-+        clang::SourceLocation sourceLocation)
- {
-     if (macroInfo && sourceLocation.isFileID()
-         && !isAlreadyParsed(m_sourceManager->getFileID(sourceLocation), m_macroSourcesManager)
-diff --git a/src/tools/clangrefactoringbackend/source/indexdataconsumer.h b/src/tools/clangrefactoringbackend/source/indexdataconsumer.h
-index c80e066b6c..e1d3529806 100644
---- a/src/tools/clangrefactoringbackend/source/indexdataconsumer.h
-+++ b/src/tools/clangrefactoringbackend/source/indexdataconsumer.h
-@@ -57,16 +57,26 @@ public:
-     IndexDataConsumer(const IndexDataConsumer &) = delete;
-     IndexDataConsumer &operator=(const IndexDataConsumer &) = delete;
- 
--    bool handleDeclOccurence(const clang::Decl *declaration,
--                             clang::index::SymbolRoleSet symbolRoles,
--                             llvm::ArrayRef<clang::index::SymbolRelation> symbolRelations,
--                             clang::SourceLocation sourceLocation,
--                             ASTNodeInfo astNodeInfo) override;
-+#if LLVM_VERSION_MAJOR >= 10
-+    bool handleDeclOccurrence(
-+#else
-+    bool handleDeclOccurence(
-+#endif
-+            const clang::Decl *declaration,
-+            clang::index::SymbolRoleSet symbolRoles,
-+            llvm::ArrayRef<clang::index::SymbolRelation> symbolRelations,
-+            clang::SourceLocation sourceLocation,
-+            ASTNodeInfo astNodeInfo) override;
- 
--    bool handleMacroOccurence(const clang::IdentifierInfo *identifierInfo,
--                              const clang::MacroInfo *macroInfo,
--                              clang::index::SymbolRoleSet roles,
--                              clang::SourceLocation sourceLocation) override;
-+#if LLVM_VERSION_MAJOR >= 10
-+    bool handleMacroOccurrence(
-+#else
-+    bool handleMacroOccurence(
-+#endif
-+                const clang::IdentifierInfo *identifierInfo,
-+                const clang::MacroInfo *macroInfo,
-+                clang::index::SymbolRoleSet roles,
-+                clang::SourceLocation sourceLocation) override;
- 
-     void finish() override;
- 
-diff --git a/src/tools/clangrefactoringbackend/source/symbolscollector.cpp b/src/tools/clangrefactoringbackend/source/symbolscollector.cpp
-index a233f6d8fe..dffd583894 100644
---- a/src/tools/clangrefactoringbackend/source/symbolscollector.cpp
-+++ b/src/tools/clangrefactoringbackend/source/symbolscollector.cpp
-@@ -74,7 +74,11 @@ std::unique_ptr<clang::tooling::FrontendActionFactory> newFrontendActionFactory(
-             : m_action(consumerFactory)
-         {}
- 
-+#if LLVM_VERSION_MAJOR >= 10
-+        std::unique_ptr<clang::FrontendAction> create() override { return std::make_unique<AdaptorAction>(m_action); }
-+#else
-         clang::FrontendAction *create() override { return new AdaptorAction(m_action); }
-+#endif
- 
-     private:
-         class AdaptorAction : public clang::ASTFrontendAction
--- 
-cgit v1.2.1
-
diff --git a/libre/qtcreator/qtcreator-preload-plugins.patch b/libre/qtcreator/qtcreator-preload-plugins.patch
index 23b2dfa3f..d4ec515fe 100644
--- a/libre/qtcreator/qtcreator-preload-plugins.patch
+++ b/libre/qtcreator/qtcreator-preload-plugins.patch
@@ -1,13 +1,13 @@
 diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clangtools/clangtidyclazyrunner.cpp
-index a580704243..7a8740a5cc 100644
+index 166d1c94e0..de0b9cc67b 100644
 --- a/src/plugins/clangtools/clangtidyclazyrunner.cpp
 +++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp
-@@ -63,7 +63,7 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis
+@@ -67,7 +67,7 @@ static QStringList clazyPluginArguments(const ClangDiagnosticConfig diagnosticCo
+     QStringList arguments;
  
-     const QString clazyChecks = diagnosticConfig.clazyChecks();
-     if (!clazyChecks.isEmpty()) {
--        arguments << XclangArgs({"-add-plugin",
-+        arguments << XclangArgs({"-load", "ClazyPlugin.so", "-add-plugin",
-                                  "clazy",
-                                  "-plugin-arg-clazy",
-                                  diagnosticConfig.clazyChecks()});
+     if (diagnosticConfig.isClazyEnabled()) {
+-        arguments << XclangArgs({"-add-plugin", "clazy"});
++        arguments << XclangArgs({"-load", "ClazyPlugin.so", "-add-plugin", "clazy"});
+         if (!diagnosticConfig.clazyChecks().isEmpty())
+             arguments << XclangArgs({"-plugin-arg-clazy", diagnosticConfig.clazyChecks()});
+     }