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
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
|
Author: Pino Toscano <pino@debian.org>
Description: Make QtWebEngine an optional requirement
This makes it possible to build konqueror, albeith without an HTML component,
also on architectures that do not have QtWebEngine.
.
2024-10-18: Updated for Qt6/KF6 by Aurélien COUDERC <coucouf@debiano.org>
Forwarded: no
Last-Update: 2024-10-18
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,8 @@ include(GenerateExportHeader)
set(KONQUEROR_LIB_VERSION "${RELEASE_SERVICE_VERSION}")
set(KONQUEROR_VERSION "${KONQUEROR_LIB_VERSION}")
-find_package(Qt${KF_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets WebEngineWidgets)
+find_package(Qt${KF_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets)
+find_package(Qt6WebEngineWidgets ${QT_MIN_VERSION})
find_package(KF${KF_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS Parts KCMUtils Archive Crash WindowSystem IconThemes DBusAddons GuiAddons I18n Sonnet TextWidgets Codecs)
find_package(KF${KF_MAJOR_VERSION} ${KF_MIN_VERSION} COMPONENTS DocTools) # Optional
@@ -70,7 +70,9 @@ add_subdirectory( client )
if(BUILD_TESTING)
add_subdirectory( autotests )
endif()
-add_subdirectory( webenginepart )
+if(Qt6WebEngineWidgets_FOUND)
+ add_subdirectory( webenginepart )
+endif()
add_subdirectory( pics )
add_subdirectory( sidebar )
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -9,8 +9,10 @@ ########### konqviewmgrtest ###############
########### konqviewmgrtest ###############
-ecm_add_test(konqviewmgrtest.cpp
- LINK_LIBRARIES konqueror_internal_lib Qt${KF_MAJOR_VERSION}::Core Qt${KF_MAJOR_VERSION}::Gui kwebenginepartlib Qt${KF_MAJOR_VERSION}::WebEngineWidgets Qt${KF_MAJOR_VERSION}::Test)
+if (Qt6WebEngineWidgets_FOUND)
+ ecm_add_test(konqviewmgrtest.cpp
+ LINK_LIBRARIES konqueror_internal_lib Qt${KF_MAJOR_VERSION}::Core Qt${KF_MAJOR_VERSION}::Gui kwebenginepartlib Qt${KF_MAJOR_VERSION}::WebEngineWidgets Qt${KF_MAJOR_VERSION}::Test)
+endif()
########### historymanagertest ###############
@@ -24,8 +26,10 @@ ########### konqhtmltest ###############
########### konqhtmltest ###############
-ecm_add_test(konqhtmltest.cpp
- LINK_LIBRARIES konqueror_internal_lib kwebenginepartlib Qt${KF_MAJOR_VERSION}::Core Qt${KF_MAJOR_VERSION}::Test)
+if (Qt6WebEngineWidgets_FOUND)
+ ecm_add_test(konqhtmltest.cpp
+ LINK_LIBRARIES konqueror_internal_lib kwebenginepartlib Qt${KF_MAJOR_VERSION}::Core Qt${KF_MAJOR_VERSION}::Test)
+endif()
########### konqviewtest ###############
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -23,7 +23,11 @@ add_subdirectory( kimgalleryplugin )
add_subdirectory( dirfilter )
add_subdirectory( uachanger )
add_subdirectory( babelfish )
-add_subdirectory( webarchiver )
+
+if (Qt6WebEngineWidgets_FOUND)
+ add_subdirectory( webarchiver )
+endif()
+
add_subdirectory( kget )
add_subdirectory( akregator )
add_subdirectory( searchbar )
--- a/libkonq/src/CMakeLists.txt
+++ b/libkonq/src/CMakeLists.txt
@@ -44,14 +44,16 @@ target_link_libraries(KF${KF_MAJOR_VERSION}Konq
KF${KF_MAJOR_VERSION}::CoreAddons
KF${KF_MAJOR_VERSION}::Service
KF${KF_MAJOR_VERSION}::Parts
- Qt${KF_MAJOR_VERSION}::WebEngineWidgets
KF${KF_MAJOR_VERSION}::TextWidgets
KF${KF_MAJOR_VERSION}::KonqSettings
PRIVATE
KF${KF_MAJOR_VERSION}::Bookmarks
KF${KF_MAJOR_VERSION}::I18n
${ZLIB_LIBRARY}
)
+if(Qt6WebEngineWidgets_FOUND)
+ target_link_libraries(KF${KF_MAJOR_VERSION}Konq PUBLIC Qt${KF_MAJOR_VERSION}::WebEngineWidgets)
+endif()
target_link_libraries(KF${KF_MAJOR_VERSION}Konq PRIVATE KF${KF_MAJOR_VERSION}::BookmarksWidgets)
--- a/src/urlloader.cpp
+++ b/src/urlloader.cpp
@@ -40,9 +40,7 @@
#include <QDebug>
#include <QArgument>
-#include <QWebEngineProfile>
#include <QMimeDatabase>
-#include <QWebEngineProfile>
#include <QFileDialog>
#include <QFileInfo>
#include <QLoggingCategory>
@@ -102,7 +102,11 @@ UrlLoader::UrlLoader(KonqMainWindow *mai
m_downloadJob->setParent(this);
}
determineStartingMimetype();
+#ifndef NO_WEBENGINE
m_ignoreDefaultHtmlPart = m_request.browserArgs.ignoreDefaultHtmlPart();
+#else
+ m_dontPassToWebEnginePart = true;
+#endif
}
UrlLoader::~UrlLoader()
|
