diff options
Diffstat (limited to 'libre/qtcreator')
| -rw-r--r-- | libre/qtcreator/PKGBUILD | 21 | ||||
| -rw-r--r-- | libre/qtcreator/libre.patch | 172 | ||||
| -rw-r--r-- | libre/qtcreator/qtcreator-preload-plugins.patch | 14 |
3 files changed, 165 insertions, 42 deletions
diff --git a/libre/qtcreator/PKGBUILD b/libre/qtcreator/PKGBUILD index 97d75167e..08ee3cc6f 100644 --- a/libre/qtcreator/PKGBUILD +++ b/libre/qtcreator/PKGBUILD @@ -1,4 +1,3 @@ -# Maintainer: bill-auger <bill-auger@programmer.net> # Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com> # Maintainer (Arch): Antonio Rojas <arojas@archlinux.org> # Contributor (Arch): Imanol Celaya <ornitorrincos@archlinux-es.org> @@ -6,19 +5,22 @@ # Contributor (Arch): Dan Vratil <progdan@progdansoft.com> # Contributor (Arch): thotypous <matiasΘarchlinux-br·org> # Contributor (Arch): delor <bartekpiech gmail com> +# Maintainer: bill-auger <bill-auger@programmer.net> # Contributor: André Silva <emulatorman@hyperbola.info> +# Contributor: Theo von Arx <theova@member.fsf.org> + # parabola changes and rationale: # - removed support for qt5-webengine pkgname=qtcreator -pkgver=4.10.2 +pkgver=4.11.0 _clangver=9.0.1 -pkgrel=1 -pkgrel+=.parabola2 +pkgrel=4 +pkgrel+=.parabola1 pkgdesc='Lightweight, cross-platform integrated development environment' -pkgdesc+=', without nonfree qt5-webengine support' +pkgdesc+=', without nonfree qt5-webengine help viewer' arch=(x86_64) arch+=(i686 armv7h) url='https://www.qt.io' @@ -39,10 +41,11 @@ 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) -source+=('libre.patch') -sha256sums=('9add6bdddfe5726bb02535409c2ed788b1afeee082121f54f887281d0e3c449a' - '150c444e76ec969fc8765774b648984037829623300d0ce9d41a915b2afa792d') -sha256sums+=('b44b9217770573b16e7bea873b0a0fb1b9f6f59502686eb6136d78bebc671ddb') +source+=(libre.patch) +sha256sums=('efebaa1c52526bf9c07b35c43071735c5d0b83b6cd08daab35a21e7ed53a7645' + 'd6f979c820e2294653f4f1853af96942bf25ff9fe9450657d45ff1c7f02bbca7') +sha256sums+=('6aeac164075b7f3f3a2e9aa75865669beeeb7903b9cbb5b6a8700205b285fe64') + prepare() { mkdir -p build diff --git a/libre/qtcreator/libre.patch b/libre/qtcreator/libre.patch index 323f94239..ac04ccbf1 100644 --- a/libre/qtcreator/libre.patch +++ b/libre/qtcreator/libre.patch @@ -1,8 +1,30 @@ +diff --git a/src/plugins/help/CMakeLists.txt b/src/plugins/help/CMakeLists.txt +index ac70c823..f6c34f3f 100644 +--- a/src/plugins/help/CMakeLists.txt ++++ b/src/plugins/help/CMakeLists.txt +@@ -37,17 +37,6 @@ extend_qtc_plugin(Help + macwebkithelpviewer.mm + ) + +-find_package(Qt5WebEngineWidgets QUIET) +-extend_qtc_plugin(Help +- CONDITION TARGET Qt5::WebEngineWidgets +- FEATURE_INFO "QtWebEngine help viewer" +- DEPENDS Qt5::WebEngineWidgets +- DEFINES QTC_WEBENGINE_HELPVIEWER +- SOURCES +- webenginehelpviewer.cpp +- webenginehelpviewer.h +-) +- + if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/qlitehtml/litehtml/CMakeLists.txt) + add_subdirectory(qlitehtml) + else() diff --git a/src/plugins/help/help.pro b/src/plugins/help/help.pro -index ffe71b6f1..a8d0bd72f 100644 +index f4786112..8d20a4bc 100644 --- a/src/plugins/help/help.pro +++ b/src/plugins/help/help.pro -@@ -60,13 +60,6 @@ FORMS += docsettingspage.ui \ +@@ -56,13 +56,6 @@ FORMS += docsettingspage.ui \ generalsettingspage.ui \ remotehelpfilter.ui @@ -15,23 +37,129 @@ index ffe71b6f1..a8d0bd72f 100644 - osx { DEFINES += QTC_MAC_NATIVE_HELPVIEWER - QT += macextras -diff --git a/src/plugins/qmakeprojectmanager/qtmodulesinfo.cpp b/src/plugins/qmakeprojectmanager/qtmodulesinfo.cpp -index a10899a2a..9ce2b463d 100644 ---- a/src/plugins/qmakeprojectmanager/qtmodulesinfo.cpp -+++ b/src/plugins/qmakeprojectmanager/qtmodulesinfo.cpp -@@ -93,14 +93,6 @@ static inline QVector<const item*> itemV - QLatin1String("QtSvg"), - QCoreApplication::translate("QtModulesInfo", "Classes for displaying the contents of SVG files"), - false}, -- {"webengine", -- QLatin1String("QtWebEngine"), -- QCoreApplication::translate("QtModulesInfo", "Classes for displaying and editing Web content using Chromium backend"), -- false}, -- {"webenginewidgets", -- QLatin1String("QtWebEngineWidgets"), -- QCoreApplication::translate("QtModulesInfo", "WebEngine and QWidget-based classes using Chromium backend"), -- false}, - {"webkit", - QLatin1String("QtWebKit"), - QCoreApplication::translate("QtModulesInfo", "Classes for displaying and editing Web content"), + HEADERS += macwebkithelpviewer.h +diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs +index d1458d84..da915e52 100644 +--- a/src/plugins/help/help.qbs ++++ b/src/plugins/help/help.qbs +@@ -5,7 +5,6 @@ QtcPlugin { + + 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 { + + cpp.defines: { + var defines = base.concat(["QT_CLUCENE_SUPPORT"]); +- if (Qt.webenginewidgets.present) +- defines.push("QTC_WEBENGINE_HELPVIEWER"); + return defines; + } + +@@ -52,14 +49,6 @@ QtcPlugin { + ] + } + +- Group { +- name: "WebEngine Sources" +- condition: Qt.webenginewidgets.present +- files: [ +- "webenginehelpviewer.cpp", "webenginehelpviewer.h" +- ] +- } +- + Group { + id: sharedSources + name: "Shared Sources" +diff --git a/src/plugins/help/localhelpmanager.cpp b/src/plugins/help/localhelpmanager.cpp +index 8af763f4..cec1134e 100644 +--- a/src/plugins/help/localhelpmanager.cpp ++++ b/src/plugins/help/localhelpmanager.cpp +@@ -31,12 +31,6 @@ + #include "helpviewer.h" + #include "textbrowserhelpviewer.h" + +-#ifdef QTC_WEBENGINE_HELPVIEWER +-#include "webenginehelpviewer.h" +-#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) +-#include <QWebEngineUrlScheme> +-#endif +-#endif + #ifdef QTC_LITEHTML_HELPVIEWER + #include "litehtmlhelpviewer.h" + #endif +@@ -87,7 +81,6 @@ static const char kLastShownPagesZoomKey[] = "Help/LastShownPagesZoom"; + static const char kLastSelectedTabKey[] = "Help/LastSelectedTab"; + static const char kViewerBackend[] = "Help/ViewerBackend"; + +-static const char kQtWebEngineBackend[] = "qtwebengine"; + static const char kTextBrowserBackend[] = "textbrowser"; + + static const int kDefaultFallbackFontSize = 14; +@@ -315,29 +308,13 @@ HelpViewerFactory LocalHelpManager::defaultViewerBackend() + return *factory; + } + if (!backend.isEmpty()) +- qWarning("Help viewer backend \"%s\" not found, using default.", backend.constData()); +- const Utils::optional<HelpViewerFactory> factory = backendForId(kQtWebEngineBackend); +- if (factory) +- return *factory; ++ qWarning("Help viewer backend \"%s\" not found.", backend.constData()); + return backendForId(kTextBrowserBackend).value_or(HelpViewerFactory()); + } + + QVector<HelpViewerFactory> LocalHelpManager::viewerBackends() + { + QVector<HelpViewerFactory> result; +-#ifdef QTC_WEBENGINE_HELPVIEWER +-#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) +- static bool schemeRegistered = false; +- if (!schemeRegistered) { +- schemeRegistered = true; +- QWebEngineUrlScheme scheme("qthelp"); +- scheme.setFlags(QWebEngineUrlScheme::LocalScheme | QWebEngineUrlScheme::LocalAccessAllowed); +- QWebEngineUrlScheme::registerScheme(scheme); +- } +-#endif +- result.append( +- {kQtWebEngineBackend, tr("QtWebEngine"), []() { return new WebEngineHelpViewer; }}); +-#endif + #ifdef QTC_LITEHTML_HELPVIEWER + result.append({"litehtml", tr("litehtml"), []() { return new LiteHtmlHelpViewer; }}); + #endif +diff --git a/tests/system/suite_general/tst_opencreator_qbs/testdata/projecttree_creator.tsv b/tests/system/suite_general/tst_opencreator_qbs/testdata/projecttree_creator.tsv +index eee34382..b9413fc2 100644 +--- a/tests/system/suite_general/tst_opencreator_qbs/testdata/projecttree_creator.tsv ++++ b/tests/system/suite_general/tst_opencreator_qbs/testdata/projecttree_creator.tsv +@@ -8098,8 +8098,6 @@ + "qtcreator_pch.h" "5" + "WebEngine Sources" "3" + "help.qbs:56" "4" +-"webenginehelpviewer.cpp" "4" +-"webenginehelpviewer.h" "4" + "ImageViewer" "2" + "imageviewer.qbs:3" "3" + "PluginMetaData" "3" +diff --git a/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv b/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv +index 4710adcf..486a0044 100644 +--- a/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv ++++ b/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv +@@ -7980,7 +7980,6 @@ + "searchtaskhandler.h" "4" + "searchwidget.h" "4" + "textbrowserhelpviewer.h" "4" +-"webenginehelpviewer.h" "4" + "xbelsupport.h" "4" + "Sources" "3" + "centralwidget.cpp" "4" +@@ -8002,7 +8001,6 @@ + "searchtaskhandler.cpp" "4" + "searchwidget.cpp" "4" + "textbrowserhelpviewer.cpp" "4" +-"webenginehelpviewer.cpp" "4" + "xbelsupport.cpp" "4" + "Forms" "3" + "docsettingspage.ui" "4" diff --git a/libre/qtcreator/qtcreator-preload-plugins.patch b/libre/qtcreator/qtcreator-preload-plugins.patch index f4772dd05..23b2dfa3f 100644 --- a/libre/qtcreator/qtcreator-preload-plugins.patch +++ b/libre/qtcreator/qtcreator-preload-plugins.patch @@ -2,20 +2,12 @@ diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clang index a580704243..7a8740a5cc 100644 --- a/src/plugins/clangtools/clangtidyclazyrunner.cpp +++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp -@@ -76,6 +76,7 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis +@@ -63,7 +63,7 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis - const ClangDiagnosticConfig::TidyMode tidyMode = m_diagnosticConfig.clangTidyMode(); - if (tidyMode != ClangDiagnosticConfig::TidyMode::Disabled) { -+ arguments << XclangArgs({"-load", "libclangTidyPlugin.so"}); - arguments << XclangArgs({"-add-plugin", "clang-tidy"}); - if (tidyMode != ClangDiagnosticConfig::TidyMode::File) { - const QString tidyChecks = m_diagnosticConfig.clangTidyChecks(); -@@ -85,7 +86,7 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis - - const QString clazyChecks = m_diagnosticConfig.clazyChecks(); + const QString clazyChecks = diagnosticConfig.clazyChecks(); if (!clazyChecks.isEmpty()) { - arguments << XclangArgs({"-add-plugin", + arguments << XclangArgs({"-load", "ClazyPlugin.so", "-add-plugin", "clazy", "-plugin-arg-clazy", - "enable-all-fixits", + diagnosticConfig.clazyChecks()}); |