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
wilder-5.14
David Rosca 11 years ago
parent 6fb5c270af
commit 6aedc9534f
  1. 3
      CMakeLists.txt
  2. 2
      drkonqi/CMakeLists.txt
  3. 4
      drkonqi/bugzillaintegration/reportassistantpages_bugzilla.cpp

@ -27,7 +27,6 @@ find_package(KF5 REQUIRED COMPONENTS Package)
find_package(KF5 5.1 REQUIRED COMPONENTS Baloo) find_package(KF5 5.1 REQUIRED COMPONENTS Baloo)
find_package(KF5TextEditor) find_package(KF5TextEditor)
find_package(KWinDBusInterface CONFIG REQUIRED) find_package(KWinDBusInterface CONFIG REQUIRED)
find_package(KF5WebKit)
find_package(Phonon4Qt5 4.6.60 REQUIRED NO_MODULE) find_package(Phonon4Qt5 4.6.60 REQUIRED NO_MODULE)
set_package_properties(Phonon4Qt5 PROPERTIES set_package_properties(Phonon4Qt5 PROPERTIES
@ -152,9 +151,7 @@ add_subdirectory(kuiserver)
add_subdirectory(menu) add_subdirectory(menu)
add_subdirectory(phonon) add_subdirectory(phonon)
add_subdirectory(solidautoeject) add_subdirectory(solidautoeject)
if(KF5WebKit_FOUND)
add_subdirectory(drkonqi) add_subdirectory(drkonqi)
endif()
add_subdirectory(soliduiserver) add_subdirectory(soliduiserver)
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)

@ -12,7 +12,6 @@ configure_file (config-drkonqi.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-drkonq
if (HAVE_X11) if (HAVE_X11)
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras) find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras)
endif() endif()
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS WebKit)
add_definitions(-DKDE_DEFAULT_DEBUG_AREA=1410) add_definitions(-DKDE_DEFAULT_DEBUG_AREA=1410)
@ -98,7 +97,6 @@ target_link_libraries(drkonqi
Qt5::DBus Qt5::DBus
KF5::XmlRpcClient KF5::XmlRpcClient
KF5::WebKit
KF5::WidgetsAddons KF5::WidgetsAddons
KF5::Wallet KF5::Wallet
drkonqi_backtrace_parser drkonqi_backtrace_parser

@ -27,6 +27,7 @@
#include <QCursor> #include <QCursor>
#include <QFileDialog> #include <QFileDialog>
#include <QTemporaryFile> #include <QTemporaryFile>
#include <QTextBrowser>
#include <QtDBus/QDBusInterface> #include <QtDBus/QDBusInterface>
#include <QtDBus/QDBusReply> #include <QtDBus/QDBusReply>
@ -39,7 +40,6 @@
#include <KCapacityBar> #include <KCapacityBar>
/* Unhandled error dialog includes */ /* Unhandled error dialog includes */
#include <KWebView>
#include <KIO/Job> #include <KIO/Job>
#include <KConfigGroup> #include <KConfigGroup>
#include <KSharedConfig> #include <KSharedConfig>
@ -798,7 +798,7 @@ UnhandledErrorDialog::UnhandledErrorDialog(QWidget * parent, const QString & err
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);
KWebView * htmlView = new KWebView(this); QTextBrowser * htmlView = new QTextBrowser(this);
QLabel * iconLabel = new QLabel(this); QLabel * iconLabel = new QLabel(this);
iconLabel->setFixedSize(32, 32); iconLabel->setFixedSize(32, 32);

Loading…
Cancel
Save