blob: 15bda36b1ee4921d95dd2b67ca7f9f99c4860ee4 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
This is temporary until I have time to write a proper patch to make the
WebEngine dependency truly optional.
Upstream-URL: https://bugs.kde.org/show_bug.cgi?id=455108
BUG: 455108
--- cantor-22.04.2/CMakeLists.txt.old 2022-06-06 22:43:15.000000000 -0500
+++ cantor-22.04.2/CMakeLists.txt 2022-06-10 00:48:15.475027350 -0500
@@ -37,9 +37,7 @@
Xml
XmlPatterns
Test
- Help
- WebEngine
- WebEngineWidgets)
+ Help)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
Config
--- cantor-22.04.2/src/CMakeLists.txt.old 2022-06-06 22:43:15.000000000 -0500
+++ cantor-22.04.2/src/CMakeLists.txt 2022-06-10 00:47:38.599064429 -0500
@@ -39,7 +39,7 @@
add_executable(cantor ${cantor_SRCS})
target_link_libraries(cantor KF5::Parts KF5::NewStuff KF5::ConfigCore KF5::CoreAddons KF5::ConfigGui
- KF5::Crash KF5::XmlGui Qt5::WebEngine cantorlibs cantor_config)
+ KF5::Crash KF5::XmlGui cantorlibs cantor_config)
########### install files ###############
install(TARGETS cantor ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
--- cantor-22.04.2/src/panelplugins/CMakeLists.txt.old 2022-06-06 22:43:15.000000000 -0500
+++ cantor-22.04.2/src/panelplugins/CMakeLists.txt 2022-06-10 00:46:15.718138007 -0500
@@ -13,4 +13,3 @@
add_subdirectory(variablemgr)
add_subdirectory(filebrowserpanel)
add_subdirectory(tocpanel)
-add_subdirectory(documentationpanel)
--- cantor-22.04.2/src/main.cpp.old 2022-06-06 22:43:15.000000000 -0500
+++ cantor-22.04.2/src/main.cpp 2022-06-10 00:46:37.755725391 -0500
@@ -17,16 +17,10 @@
#include <QFileInfo>
#include <QDir>
#include <QDebug>
-#include <QtWebEngine>
int main(int argc, char **argv)
{
- QtWebEngine::initialize();
- // Register custom scheme handler for qthelp:// scheme
- QWebEngineUrlScheme qthelp("qthelp");
- QWebEngineUrlScheme::registerScheme(qthelp);
-
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QApplication app(argc, argv);
|
