summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MatrixWebView.cpp5
-rw-r--r--MatrixWebView.h5
-rw-r--r--[-rwxr-xr-x]main.cpp1
-rwxr-xr-xmatrix_browser.pro2
4 files changed, 4 insertions, 9 deletions
diff --git a/MatrixWebView.cpp b/MatrixWebView.cpp
index 48459b7..72c4967 100644
--- a/MatrixWebView.cpp
+++ b/MatrixWebView.cpp
@@ -37,9 +37,6 @@
37 * 37 *
38*/ 38*/
39 39
40#include <QtWidgets>
41#include <QtNetwork>
42#include <QtWebKitWidgets>
43#include "MatrixWebView.h" 40#include "MatrixWebView.h"
44#include <sys/types.h> 41#include <sys/types.h>
45#include <sys/socket.h> 42#include <sys/socket.h>
@@ -53,7 +50,7 @@ MatrixWebView::MatrixWebView(const QUrl& url)
53 if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sigtermFd)) 50 if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sigtermFd))
54 qFatal("Couldn't create TERM socketpair"); 51 qFatal("Couldn't create TERM socketpair");
55 52
56 view = new QWebView(this); 53 view = new QWebEngineView(this);
57 view->load(url); 54 view->load(url);
58 setCentralWidget(view); 55 setCentralWidget(view);
59 56
diff --git a/MatrixWebView.h b/MatrixWebView.h
index fec7249..b6d2cc5 100644
--- a/MatrixWebView.h
+++ b/MatrixWebView.h
@@ -40,8 +40,7 @@
40#define MATRIXWEBVIEW_H 40#define MATRIXWEBVIEW_H
41 41
42#include <QtWidgets> 42#include <QtWidgets>
43#include <QWebView> 43#include <QWebEngineView>
44#include <QGraphicsWebView>
45#include <QSocketNotifier> 44#include <QSocketNotifier>
46#include <QMainWindow> 45#include <QMainWindow>
47 46
@@ -62,7 +61,7 @@ public slots:
62private: 61private:
63 static int sigtermFd[2]; 62 static int sigtermFd[2];
64 QSocketNotifier *snTerm; 63 QSocketNotifier *snTerm;
65 QWebView *view; 64 QWebEngineView *view;
66}; 65};
67 66
68#endif 67#endif
diff --git a/main.cpp b/main.cpp
index a1ccd80..dceece5 100755..100644
--- a/main.cpp
+++ b/main.cpp
@@ -36,7 +36,6 @@
36 * 36 *
37*/ 37*/
38 38
39#include <QtWidgets>
40#include <iostream> 39#include <iostream>
41#include <QApplication> 40#include <QApplication>
42#include "MatrixWebView.h" 41#include "MatrixWebView.h"
diff --git a/matrix_browser.pro b/matrix_browser.pro
index a6d8e1c..c6d9894 100755
--- a/matrix_browser.pro
+++ b/matrix_browser.pro
@@ -6,7 +6,7 @@ TEMPLATE = app
6TARGET = matrix_browser 6TARGET = matrix_browser
7DEPENDPATH += . 7DEPENDPATH += .
8INCLUDEPATH += . 8INCLUDEPATH += .
9QT += webkit webkitwidgets 9QT += webenginewidgets
10# Input 10# Input
11SOURCES += main.cpp MatrixWebView.cpp 11SOURCES += main.cpp MatrixWebView.cpp
12HEADERS = MatrixWebView.h 12HEADERS = MatrixWebView.h