From: Denys Dmytriyenko <denys@ti.com>
To: Eric Ruei <e-ruei1@ti.com>
Cc: meta-arago@arago-project.org
Subject: Re: [PATCH] matrix_browser: update for QWebEngine from QWebKit
Date: Thu, 24 Aug 2017 19:21:37 -0400 [thread overview]
Message-ID: <20170824232137.GA4311@edge> (raw)
In-Reply-To: <1503616027-50489-1-git-send-email-e-ruei1@ti.com>
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 <e-ruei1@ti.com>
> ---
> 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
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
next prev parent reply other threads:[~2017-08-24 23:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-24 23:07 [PATCH] matrix_browser: update for QWebEngine from QWebKit Eric Ruei
2017-08-24 23:21 ` Denys Dmytriyenko [this message]
2017-08-25 13:53 ` Ruei, Eric
2017-08-25 22:11 ` Denys Dmytriyenko
2017-08-25 22:09 ` Ruei, Eric
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170824232137.GA4311@edge \
--to=denys@ti.com \
--cc=e-ruei1@ti.com \
--cc=meta-arago@arago-project.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.