Replace WebKit with WebEngine

CMakeLists.txt

@@ -20,8 +20,8 @@ find_package (Qt5Widgets REQUIRED)
 find_package (Qt5Gui REQUIRED)
 find_package (Qt5Sql REQUIRED)
 find_package (Qt5Network REQUIRED)
-find_package (Qt5WebKit REQUIRED)
-find_package (Qt5WebKitWidgets REQUIRED)
+find_package (Qt5WebEngine REQUIRED)
+find_package (Qt5WebEngineWidgets REQUIRED)
 
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(TIDY REQUIRED tidy)
@@ -432,5 +432,5 @@ include_directories(${TIDY_INCLUDE_DIRS})
 add_executable(nixnote2 ${nixnote2_src} ${nixnote2_hdr_moc})
 add_executable(tests ${nixnote2_src} ${nixnote2_hdr_moc})
 
-target_link_libraries(nixnote2 Qt5::Widgets Qt5::Sql Qt5::Gui Qt5::Network Qt5:WebKit Qt5:WebKitWidgets)
-target_link_libraries(tests Qt5::Widgets Qt5::Sql Qt5::Gui Qt5::Network Qt5:WebKit Qt5:WebKitWidgets)
+target_link_libraries(nixnote2 Qt5::Widgets Qt5::Sql Qt5::Gui Qt5::Network Qt5:WebEngine Qt5:WebEngineWidgets)
+target_link_libraries(tests Qt5::Widgets Qt5::Sql Qt5::Gui Qt5::Network Qt5:WebEngine Qt5:WebEngineWidgets)

nixnote2.pro

@@ -1,4 +1,4 @@
-QT += core gui widgets printsupport webkit webkitwidgets sql network xml dbus qml concurrent
+QT += core gui widgets printsupport webkit webenginewidgets sql network xml dbus qml concurrent
 
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
 unix {

src/dialog/aboutdialog.cpp

@@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ***********************************************************************************/
 
 #include "aboutdialog.h"
-#include <QWebView>
+#include <QWebEngineView>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QPushButton>
@@ -30,7 +30,7 @@ AboutDialog::AboutDialog(QDialog *parent) :
     QDialog(parent) {
     QVBoxLayout *mainLayout = new QVBoxLayout();
     this->setLayout(mainLayout);
-    QWebView *page = new QWebView();
+    QWebEngineView *page = new QWebEngineView();
     QPushButton *okButton = new QPushButton();
     okButton->setText(tr("OK"));
     mainLayout->addWidget(page);

src/gui/browserWidgets/ntitleeditor.h

@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "src/qevercloud/QEverCloud/headers/QEverCloud.h"
 
-#include <QtWebKit>
+#include <QtWebEngine>
 #include <QLineEdit>
 
 using namespace qevercloud;

src/gui/browserWidgets/table/tablepropertiesdialog.cpp

@@ -105,7 +105,7 @@ TablePropertiesDialog::TablePropertiesDialog(QString tableCss, QString cellCss,
     tabs->addTab(tablePanel, tr("Table Properties"));
     tabs->addTab(cellPanel,tr("Cell Properties"));
 
-    preview = new QWebView();
+    preview = new QWebEngineView();
     mainLayout->addWidget(preview);
 
     mainLayout->addLayout(buttonLayout);

src/gui/browserWidgets/table/tablepropertiesdialog.h

@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
-#include <QWebView>
+#include <QWebEngineView>
 #include <QComboBox>
 #include <QSpinBox>
 #include <QLabel>
@@ -111,7 +111,7 @@ class TablePropertiesDialog : public QDialog
     QPushButton *okButton;                        // Dialog box OK button
     QPushButton *cancelButton;                    // Dialog box cancel button
     QTabWidget  *tabs;                            // Tab widget holding table & cell options
-    QWebView *preview;                            // HTML page showing the user's selected values
+    QWebEngineView *preview;                      // HTML page showing the user's selected values
 
     QLabel *paddingLabel;                         // Label used to show cell padding selection
     QHBoxLayout *borderSizeLayout;                // layout used for the border size selection

src/gui/findreplace.cpp

@@ -146,12 +146,12 @@ void FindReplace::textChanged() {
 
 
 
-QWebPage::FindFlags FindReplace::getCaseSensitive() {
-    QWebPage::FindFlags ff;
-    ff = QWebPage::HighlightAllOccurrences;
+QWebEnginePage::FindFlags FindReplace::getCaseSensitive() {
+    QWebEnginePage::FindFlags ff;
+    ff = QWebEnginePage::HighlightAllOccurrences;
     ff = 0;
     if (caseSensitive->isChecked())
-        ff = ff | QWebPage::FindCaseSensitively;
+        ff = ff | QWebEnginePage::FindCaseSensitively;
 
     return ff;
 }

src/gui/findreplace.h

@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <QPushButton>
 #include <QCheckBox>
 #include <QHBoxLayout>
-#include <QWebPage>
+#include <QWebEnginePage>
 
 class FindReplace : public QWidget
 {
@@ -44,7 +44,7 @@ class FindReplace : public QWidget
     QPushButton *replaceAllButton;
     QLineEdit *replaceLine;
     QCheckBox *caseSensitive;
-    QWebPage::FindFlags getCaseSensitive();
+    QWebEnginePage::FindFlags getCaseSensitive();
 
 signals: