--- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ ecm_setup_version(${AKONADI_CONTACTS_VER ) set(QT_REQUIRED_VERSION "5.6.0") -find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test WebEngine WebEngineWidgets) +find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test) ########### Find packages ########### find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5Completion ${KF5_VERSION} CONFIG REQUIRED) --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -80,7 +80,6 @@ set(akonadicontact_editor_generalinfo_SR set(akonadicontact_addresslocation_web_editor_SRCS editor/addresseditor/webengine/addresseslocationengineviewer.cpp - editor/addresseditor/webengine/addresseslocationenginepage.cpp ) set(akonadicontact_addresslocation_editor_SRCS @@ -211,8 +210,6 @@ target_link_libraries(KF5AkonadiContact KF5::WidgetsAddons KF5::XmlGui Grantlee5::Templates - Qt5::WebEngine - Qt5::WebEngineWidgets ) if(KF5Prison_FOUND) --- a/src/editor/addresseditor/webengine/addresseslocationengineviewer.h +++ b/src/editor/addresseditor/webengine/addresseslocationengineviewer.h @@ -22,12 +22,12 @@ #ifndef AddressesLocationEngineViewer_H #define AddressesLocationEngineViewer_H -#include +#include #include namespace Akonadi { class AddressesLocationGrantleeFormater; -class AddressesLocationEngineViewer : public QWebEngineView +class AddressesLocationEngineViewer : public QTextBrowser { Q_OBJECT public: --- a/src/editor/addresseditor/webengine/addresseslocationengineviewer.cpp +++ b/src/editor/addresseditor/webengine/addresseslocationengineviewer.cpp @@ -20,27 +20,22 @@ */ #include "addresseslocationengineviewer.h" -#include "addresseslocationenginepage.h" #include "akonadi_contact_debug.h" #include "../addresseslocationgrantleeformater.h" #include #include #include -#include using namespace Akonadi; AddressesLocationEngineViewer::AddressesLocationEngineViewer(QWidget *parent) - : QWebEngineView(parent), + : QTextBrowser(parent), mAddressesLocationGrantleeFormatter(new AddressesLocationGrantleeFormater(this)), mEditMode(false) { - AddressesLocationEnginePage *pageEngine = new AddressesLocationEnginePage(this); - setPage(pageEngine); - setFocusPolicy(Qt::WheelFocus); - connect(pageEngine, &AddressesLocationEnginePage::urlClicked, this, &AddressesLocationEngineViewer::slotLinkClicked); + connect(this, &AddressesLocationEngineViewer::anchorClicked, this, &AddressesLocationEngineViewer::slotLinkClicked); setContextMenuPolicy(Qt::CustomContextMenu); } @@ -122,7 +117,7 @@ void AddressesLocationEngineViewer::upda void AddressesLocationEngineViewer::updateView() { const QString html = mAddressesLocationGrantleeFormatter->formatAddresses(mAddresses); - setHtml(html, QUrl(QStringLiteral("file://"))); + setHtml(html); } void AddressesLocationEngineViewer::addAddress(const KContacts::Address &address)