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
|
diff -rupN kdepim-runtime-18.12.2/CMakeLists.txt kdepim-runtime-18.12.2.new/CMakeLists.txt
--- kdepim-runtime-18.12.2/CMakeLists.txt 2019-02-05 01:49:01.000000000 +0100
+++ kdepim-runtime-18.12.2.new/CMakeLists.txt 2019-02-26 17:17:24.411619477 +0100
@@ -98,7 +98,7 @@ set_package_properties(Sasl2 PROPERTIES
find_package(Qca-qt5)
# QT5 package
-find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED TextToSpeech Network Widgets Test XmlPatterns DBus WebEngineWidgets)
+find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED TextToSpeech Network Widgets Test XmlPatterns DBus)
find_package(Qt5 OPTIONAL_COMPONENTS NetworkAuth)
if (NOT Qt5NetworkAuth_FOUND)
message(STATUS "Qt5NetworkAuth not found, OAuth2 authentication will not be supported")
diff -rupN kdepim-runtime-18.12.2/resources/CMakeLists.txt kdepim-runtime-18.12.2.new/resources/CMakeLists.txt
--- kdepim-runtime-18.12.2/resources/CMakeLists.txt 2019-01-30 08:34:37.000000000 +0100
+++ kdepim-runtime-18.12.2.new/resources/CMakeLists.txt 2019-02-26 17:52:33.024796657 +0100
@@ -45,7 +45,7 @@ add_subdirectory( imap )
if (Libkolabxml_FOUND)
add_subdirectory( kolab )
endif()
-add_subdirectory( facebook )
+#add_subdirectory( facebook )
add_subdirectory( maildir )
add_subdirectory( openxchange )
@@ -64,4 +64,4 @@ add_subdirectory( icaldir )
add_subdirectory( vcard )
add_subdirectory( folderarchivesettings )
add_subdirectory( tomboynotes )
-add_subdirectory( ews )
+#add_subdirectory( ews )
diff -rupN kdepim-runtime-18.12.2/resources/tomboynotes/CMakeLists.txt kdepim-runtime-18.12.2.new/resources/tomboynotes/CMakeLists.txt
--- kdepim-runtime-18.12.2/resources/tomboynotes/CMakeLists.txt 2019-01-30 08:34:37.000000000 +0100
+++ kdepim-runtime-18.12.2.new/resources/tomboynotes/CMakeLists.txt 2019-02-26 17:16:50.517846453 +0100
@@ -56,7 +56,6 @@ target_link_libraries(akonadi_tomboynote
Qt5::DBus
Qt5::Gui
Qt5::Network
- Qt5::WebEngineWidgets
KF5::AkonadiAgentBase
KF5::AkonadiNotes
KF5::ConfigCore
diff -rupN kdepim-runtime-18.12.2/resources/tomboynotes/tomboyserverauthenticatejob.cpp kdepim-runtime-18.12.2.new/resources/tomboynotes/tomboyserverauthenticatejob.cpp
--- kdepim-runtime-18.12.2/resources/tomboynotes/tomboyserverauthenticatejob.cpp 2019-01-30 08:34:37.000000000 +0100
+++ kdepim-runtime-18.12.2.new/resources/tomboynotes/tomboyserverauthenticatejob.cpp 2019-02-26 17:42:47.984027404 +0100
@@ -25,19 +25,14 @@
TomboyServerAuthenticateJob::TomboyServerAuthenticateJob(KIO::AccessManager *manager, QObject *parent)
: TomboyJobBase(manager, parent)
- , mWebView(new QWebEngineView(nullptr))
{
- mWebView->setContextMenuPolicy(Qt::NoContextMenu);
// 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()
@@ -83,8 +78,6 @@ void TomboyServerAuthenticateJob::onLink
void TomboyServerAuthenticateJob::onOpenBrowser(const QUrl &url)
{
- mWebView->setUrl(url);
- mWebView->show();
}
void TomboyServerAuthenticateJob::onApiRequestFinished()
diff -rupN kdepim-runtime-18.12.2/resources/tomboynotes/tomboyserverauthenticatejob.h kdepim-runtime-18.12.2.new/resources/tomboynotes/tomboyserverauthenticatejob.h
--- kdepim-runtime-18.12.2/resources/tomboynotes/tomboyserverauthenticatejob.h 2019-01-30 08:34:37.000000000 +0100
+++ kdepim-runtime-18.12.2.new/resources/tomboynotes/tomboyserverauthenticatejob.h 2019-02-26 17:19:35.666654616 +0100
@@ -22,7 +22,6 @@
#include "tomboyjobbase.h"
#include <QString>
-#include <QWebEngineView>
class TomboyServerAuthenticateJob : public TomboyJobBase
{
@@ -47,8 +46,6 @@ private:
void onApiRequestFinished();
void onUserRequestFinished();
QString mUserURL;
-
- QWebEngineView *mWebView = nullptr;
};
#endif // TOMBOYSERVERAUTHENTICATEJOB_H
|
