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
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6786adc43..825e6bfaa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,7 +82,7 @@ find_package( SharedMimeInfo REQUIRED )
# QT5 package
-find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Network Widgets Test XmlPatterns DBus WebEngineWidgets)
+find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Network Widgets Test XmlPatterns DBus)
find_package(Qt5 OPTIONAL_COMPONENTS TextToSpeech)
if (NOT Qt5TextToSpeech_FOUND)
message(STATUS "Qt5TextToSpeech not found, speech feature will be disabled")
diff --git a/resources/tomboynotes/CMakeLists.txt b/resources/tomboynotes/CMakeLists.txt
index a49caa91e..97b36a587 100644
--- a/resources/tomboynotes/CMakeLists.txt
+++ b/resources/tomboynotes/CMakeLists.txt
@@ -60,7 +60,6 @@ target_link_libraries(akonadi_tomboynotes_resource
Qt5::DBus
Qt5::Gui
Qt5::Network
- Qt5::WebEngineWidgets
KF5::AkonadiAgentBase
KF5::AkonadiNotes
KF5::ConfigCore
diff --git a/resources/tomboynotes/tomboyserverauthenticatejob.cpp b/resources/tomboynotes/tomboyserverauthenticatejob.cpp
index 00ad110e2..45e3af5e7 100644
--- a/resources/tomboynotes/tomboyserverauthenticatejob.cpp
+++ b/resources/tomboynotes/tomboyserverauthenticatejob.cpp
@@ -24,19 +24,15 @@
#include <QJsonObject>
TomboyServerAuthenticateJob::TomboyServerAuthenticateJob(KIO::AccessManager *manager, QObject *parent)
- : TomboyJobBase(manager, parent),
- mWebView(new QWebEngineView(Q_NULLPTR))
+ : TomboyJobBase(manager, parent)
{
// Connect the o2 authenfication signals
connect(mO1, &O1::linkingFailed, this, &TomboyServerAuthenticateJob::onLinkingFailed);
connect(mO1, &O1::linkingSucceeded, this, &TomboyServerAuthenticateJob::onLinkingSucceeded);
- connect(mO1, &O1::openBrowser, this, &TomboyServerAuthenticateJob::onOpenBrowser);
- connect(mO1, &O1::closeBrowser, mWebView, &QWebEngineView::close);
}
TomboyServerAuthenticateJob::~TomboyServerAuthenticateJob()
{
- delete mWebView;
}
void TomboyServerAuthenticateJob::start()
@@ -82,8 +78,6 @@ void TomboyServerAuthenticateJob::onLinkingSucceeded()
void TomboyServerAuthenticateJob::onOpenBrowser(const QUrl &url)
{
- mWebView->setUrl(url);
- mWebView->show();
}
void TomboyServerAuthenticateJob::onApiRequestFinished()
diff --git a/resources/tomboynotes/tomboyserverauthenticatejob.h b/resources/tomboynotes/tomboyserverauthenticatejob.h
index 6743406d1..5a70ae4e6 100644
--- a/resources/tomboynotes/tomboyserverauthenticatejob.h
+++ b/resources/tomboynotes/tomboyserverauthenticatejob.h
@@ -22,7 +22,6 @@
#include "tomboyjobbase.h"
#include <QString>
-#include <QWebEngineView>
class TomboyServerAuthenticateJob : public TomboyJobBase
{
@@ -48,8 +47,6 @@ private:
void onUserRequestFinished();
QString mUserURL;
- QWebEngineView *mWebView;
-
};
#endif // TOMBOYSERVERAUTHENTICATEJOB_H
|
