matrix_browser: update for QWebEngine from QWebKit

Replace QWebkit with QWebEngine because QWebkit is obslete.

Signed-off-by: Eric Ruei <e-ruei1@ti.com>
Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>

diff --git a/MatrixWebView.cpp b/MatrixWebView.cpp
index 48459b7da56d39be9b144ff1a9e99175abc3097a..72c49678b6bedbad20335d903d10abc91186632b 100644 (file)
--- a/MatrixWebView.cpp
+++ b/MatrixWebView.cpp
@@ -37,9 +37,6 @@
  *
 */
 
-#include <QtWidgets>
-#include <QtNetwork>
-#include <QtWebKitWidgets>
 #include "MatrixWebView.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -53,7 +50,7 @@ MatrixWebView::MatrixWebView(const QUrl& url)
     if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sigtermFd))
        qFatal("Couldn't create TERM socketpair");
 
-    view = new QWebView(this);
+    view = new QWebEngineView(this);
     view->load(url);
     setCentralWidget(view);
 

diff --git a/MatrixWebView.h b/MatrixWebView.h
index fec7249d81c4bc2632311de39559b7de736e93a2..b6d2cc5ae3433428fd55eefe306260cd4516432b 100644 (file)
--- a/MatrixWebView.h
+++ b/MatrixWebView.h
@@ -40,8 +40,7 @@
 #define MATRIXWEBVIEW_H
 
 #include <QtWidgets>
-#include <QWebView>
-#include <QGraphicsWebView>
+#include <QWebEngineView>
 #include <QSocketNotifier>
 #include <QMainWindow>
 
@@ -62,7 +61,7 @@ public slots:
 private:
     static int sigtermFd[2];
     QSocketNotifier *snTerm;
-    QWebView *view;
+    QWebEngineView *view;
 };
 
 #endif

diff --git a/main.cpp b/main.cpp
old mode 100755 (executable)
new mode 100644 (file)
index a1ccd80..dceece5
--- a/main.cpp
+++ b/main.cpp
@@ -36,7 +36,6 @@
  *
 */
 
-#include <QtWidgets>
 #include <iostream> 
 #include <QApplication>
 #include "MatrixWebView.h"

diff --git a/matrix_browser.pro b/matrix_browser.pro
index a6d8e1c73b4d7b5220f34db313aec143b40652b4..c6d989488d9a20f38907e58cc88d550060f7320d 100755 (executable)
--- a/matrix_browser.pro
+++ b/matrix_browser.pro
@@ -6,7 +6,7 @@ TEMPLATE = app
 TARGET = matrix_browser
 DEPENDPATH += .
 INCLUDEPATH += .
-QT       +=   webkit webkitwidgets
+QT       +=   webenginewidgets
 # Input
 SOURCES += main.cpp MatrixWebView.cpp
 HEADERS = MatrixWebView.h