Eric, Please indicate the component this patch is meant for in square brackets.
On Thu, Aug 24, 2017 at 07:07:07PM -0400, Eric Ruei wrote: > Replace QWebkit with QWebEngine because QWebkit is obslete. > > > Signed-off-by: Eric Ruei <[email protected]> > --- > MatrixWebView.cpp | 5 +---- > MatrixWebView.h | 5 ++--- > main.cpp | 1 - > matrix_browser.pro | 2 +- > 4 files changed, 4 insertions(+), 9 deletions(-) > mode change 100755 => 100644 main.cpp > > diff --git a/MatrixWebView.cpp b/MatrixWebView.cpp > index 48459b7..72c4967 100644 > --- 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 fec7249..b6d2cc5 100644 > --- 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 > new mode 100644 > 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 a6d8e1c..c6d9894 100755 > --- 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 > -- > 1.9.1 > > _______________________________________________ > meta-arago mailing list > [email protected] > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
