From 6aedc9534f76f9fb0d5d9560f81a704bda1e8df7 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Mon, 2 Nov 2015 10:39:36 +0100 Subject: [PATCH] drkonqi: Drop KF5::WebKit dependency Replace KWebView with QTextBrowser in unhandled bugzilla error dialog. KWebView is not used to load a page here, it is just used to display HTML with setHtml (without baseUrl) so any external URLs (stylesheets, images, ...) are not resolved. Replacing it with QTextBrowser should provide similar rendering. REVIEW: 125886 --- CMakeLists.txt | 3 --- drkonqi/CMakeLists.txt | 2 -- drkonqi/bugzillaintegration/reportassistantpages_bugzilla.cpp | 4 ++-- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 50091ea8f..86d1531ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,6 @@ find_package(KF5 REQUIRED COMPONENTS Package) find_package(KF5 5.1 REQUIRED COMPONENTS Baloo) find_package(KF5TextEditor) find_package(KWinDBusInterface CONFIG REQUIRED) -find_package(KF5WebKit) find_package(Phonon4Qt5 4.6.60 REQUIRED NO_MODULE) set_package_properties(Phonon4Qt5 PROPERTIES @@ -152,9 +151,7 @@ add_subdirectory(kuiserver) add_subdirectory(menu) add_subdirectory(phonon) add_subdirectory(solidautoeject) -if(KF5WebKit_FOUND) add_subdirectory(drkonqi) -endif() add_subdirectory(soliduiserver) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/drkonqi/CMakeLists.txt b/drkonqi/CMakeLists.txt index 339b475c9..eaeaad4d7 100644 --- a/drkonqi/CMakeLists.txt +++ b/drkonqi/CMakeLists.txt @@ -12,7 +12,6 @@ configure_file (config-drkonqi.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-drkonq if (HAVE_X11) find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras) endif() -find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS WebKit) add_definitions(-DKDE_DEFAULT_DEBUG_AREA=1410) @@ -98,7 +97,6 @@ target_link_libraries(drkonqi Qt5::DBus KF5::XmlRpcClient - KF5::WebKit KF5::WidgetsAddons KF5::Wallet drkonqi_backtrace_parser diff --git a/drkonqi/bugzillaintegration/reportassistantpages_bugzilla.cpp b/drkonqi/bugzillaintegration/reportassistantpages_bugzilla.cpp index 9768f7b08..e60fb1473 100644 --- a/drkonqi/bugzillaintegration/reportassistantpages_bugzilla.cpp +++ b/drkonqi/bugzillaintegration/reportassistantpages_bugzilla.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -39,7 +40,6 @@ #include /* Unhandled error dialog includes */ -#include #include #include #include @@ -798,7 +798,7 @@ UnhandledErrorDialog::UnhandledErrorDialog(QWidget * parent, const QString & err setAttribute(Qt::WA_DeleteOnClose); - KWebView * htmlView = new KWebView(this); + QTextBrowser * htmlView = new QTextBrowser(this); QLabel * iconLabel = new QLabel(this); iconLabel->setFixedSize(32, 32);