summaryrefslogtreecommitdiff
path: root/libre/qtcreator/libre.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/qtcreator/libre.patch')
-rw-r--r--libre/qtcreator/libre.patch172
1 files changed, 150 insertions, 22 deletions
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"
generated by cgit v1.2.2 (git 2.25.0) at 2024-05-06 11:23:39 +0000