All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] matrix_browser: update for QWebEngine from QWebKit
@ 2017-08-24 23:07 Eric Ruei
  2017-08-24 23:21 ` Denys Dmytriyenko
  0 siblings, 1 reply; 5+ messages in thread
From: Eric Ruei @ 2017-08-24 23:07 UTC (permalink / raw)
  To: meta-arago

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



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] matrix_browser: update for QWebEngine from QWebKit
  2017-08-24 23:07 [PATCH] matrix_browser: update for QWebEngine from QWebKit Eric Ruei
@ 2017-08-24 23:21 ` Denys Dmytriyenko
  2017-08-25 13:53   ` Ruei, Eric
  2017-08-25 22:09   ` Ruei, Eric
  0 siblings, 2 replies; 5+ messages in thread
From: Denys Dmytriyenko @ 2017-08-24 23:21 UTC (permalink / raw)
  To: Eric Ruei; +Cc: meta-arago

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


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] matrix_browser: update for QWebEngine from QWebKit
  2017-08-24 23:21 ` Denys Dmytriyenko
@ 2017-08-25 13:53   ` Ruei, Eric
  2017-08-25 22:11     ` Denys Dmytriyenko
  2017-08-25 22:09   ` Ruei, Eric
  1 sibling, 1 reply; 5+ messages in thread
From: Ruei, Eric @ 2017-08-25 13:53 UTC (permalink / raw)
  To: Dmytriyenko, Denys; +Cc: meta-arago

Hi, Denys:

Do you mean meta-arago component? 

For example:

[meta-arago] [matrix-gui-browser: PATCH v2] matrix_browser: update for QWebEngine from QWebKit

Best regards,

Eric



-----Original Message-----
From: Dmytriyenko, Denys 
Sent: Thursday, August 24, 2017 7:22 PM
To: Ruei, Eric
Cc: meta-arago@arago-project.org
Subject: Re: [meta-arago] [PATCH] matrix_browser: update for QWebEngine from QWebKit

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


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] matrix_browser: update for QWebEngine from QWebKit
  2017-08-24 23:21 ` Denys Dmytriyenko
  2017-08-25 13:53   ` Ruei, Eric
@ 2017-08-25 22:09   ` Ruei, Eric
  1 sibling, 0 replies; 5+ messages in thread
From: Ruei, Eric @ 2017-08-25 22:09 UTC (permalink / raw)
  To: Dmytriyenko, Denys; +Cc: meta-arago

Hi, Denys:

Do you require v2 as shown below?

Hongmei: can you merge the change if there are no other comments?

Best regards,

Eric


-----Original Message-----
From: Ruei, Eric 
Sent: Friday, August 25, 2017 9:53 AM
To: Dmytriyenko, Denys
Cc: meta-arago@arago-project.org
Subject: RE: [meta-arago] [PATCH] matrix_browser: update for QWebEngine from QWebKit

Hi, Denys:

Do you mean meta-arago component? 

For example:

[meta-arago] [matrix-gui-browser: PATCH v2] matrix_browser: update for QWebEngine from QWebKit

Best regards,

Eric



-----Original Message-----
From: Dmytriyenko, Denys
Sent: Thursday, August 24, 2017 7:22 PM
To: Ruei, Eric
Cc: meta-arago@arago-project.org
Subject: Re: [meta-arago] [PATCH] matrix_browser: update for QWebEngine from QWebKit

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


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] matrix_browser: update for QWebEngine from QWebKit
  2017-08-25 13:53   ` Ruei, Eric
@ 2017-08-25 22:11     ` Denys Dmytriyenko
  0 siblings, 0 replies; 5+ messages in thread
From: Denys Dmytriyenko @ 2017-08-25 22:11 UTC (permalink / raw)
  To: Ruei, Eric; +Cc: meta-arago

Eric,

See here for several examples of different components:

http://arago-project.org/pipermail/meta-arago/2017-July/thread.html

-- 
Denys


On Fri, Aug 25, 2017 at 09:53:25AM -0400, Ruei, Eric wrote:
> Hi, Denys:
> 
> Do you mean meta-arago component? 
> 
> For example:
> 
> [meta-arago] [matrix-gui-browser: PATCH v2] matrix_browser: update for QWebEngine from QWebKit
> 
> Best regards,
> 
> Eric
> 
> 
> 
> -----Original Message-----
> From: Dmytriyenko, Denys 
> Sent: Thursday, August 24, 2017 7:22 PM
> To: Ruei, Eric
> Cc: meta-arago@arago-project.org
> Subject: Re: [meta-arago] [PATCH] matrix_browser: update for QWebEngine from QWebKit
> 
> 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


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2017-08-25 22:11 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-24 23:07 [PATCH] matrix_browser: update for QWebEngine from QWebKit Eric Ruei
2017-08-24 23:21 ` Denys Dmytriyenko
2017-08-25 13:53   ` Ruei, Eric
2017-08-25 22:11     ` Denys Dmytriyenko
2017-08-25 22:09   ` Ruei, Eric

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.