[matrix-gui-v2-apps][PATCH v2] qt5_browser & browser_apps: replace webkit-based demo browsers with webengine-based ones

[matrix-gui-v2-apps][PATCH v2] qt5_browser & browser_apps: replace webkit-based demo browsers with webengine-based ones

[Eric Ruei]

Replace webkit-based demo browser because webkit is obsolete and will be
removed soon.

Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
 .../browser_webengine.desktop}                                      | 6 +++---
 qt5_apps/qt5_browser/qt5_browser.desktop                            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename browser_apps/{browser_webkit/browser_webkit.desktop => browser_webengine/browser_webengine.desktop} (56%)

diff --git a/browser_apps/browser_webkit/browser_webkit.desktop b/browser_apps/browser_webengine/browser_webengine.desktop
similarity index 56%
rename from browser_apps/browser_webkit/browser_webkit.desktop
rename to browser_apps/browser_webengine/browser_webengine.desktop
index 7140a4b..53b95ca 100644
--- a/browser_apps/browser_webkit/browser_webkit.desktop
+++ b/browser_apps/browser_webengine/browser_webengine.desktop
@@ -1,12 +1,12 @@
 #!/usr/bin/env xdg-open
 
 [Desktop Entry]
-Name=Webkit Browser
+Name=WebEngine Browser
 GenericName=Demo App
 Icon=/usr/share/matrix-gui-2.0/apps/images/web-icon.png
-Exec=/usr/share/qt5/examples/webkitwidgets/browser/browser http://www.ti.com
+Exec=/usr/share/qt5/examples/webenginewidgets/demobrowser/demobrowser http://www.ti.com
 Type=Application
 ProgramType=gui
 Categories=Browser
 X-MATRIX-Lock=browser
-Name[en_US]=browser_webkit.desktop
+Name[en_US]=browser_webengine.desktop
diff --git a/qt5_apps/qt5_browser/qt5_browser.desktop b/qt5_apps/qt5_browser/qt5_browser.desktop
index 2f6636f..a5d3953 100644
--- a/qt5_apps/qt5_browser/qt5_browser.desktop
+++ b/qt5_apps/qt5_browser/qt5_browser.desktop
@@ -4,7 +4,7 @@
 Name=Browser
 GenericName=Demo App
 Icon=/usr/share/matrix-gui-2.0/apps/images/web-icon.png
-Exec=/usr/share/qt5/examples/webkitwidgets/browser/browser http://www.ti.com
+Exec=/usr/share/qt5/examples/webenginewidgets/demobrowser/demobrowser http://www.ti.com
 Type=Application
 ProgramType=gui
 Categories=Qt5
-- 
1.9.1

Re: [EXTERNAL] [matrix-gui-v2-apps][PATCH v2] qt5_browser & browser_apps: replace webkit-based demo browsers with webengine-based ones

[Jacob Stiffler]

Pushed.


On 8/29/2017 10:50 AM, Eric Ruei wrote:
> Replace webkit-based demo browser because webkit is obsolete and will be
> removed soon.
>
> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> ---
>   .../browser_webengine.desktop}                                      | 6 +++---
>   qt5_apps/qt5_browser/qt5_browser.desktop                            | 2 +-
>   2 files changed, 4 insertions(+), 4 deletions(-)
>   rename browser_apps/{browser_webkit/browser_webkit.desktop => browser_webengine/browser_webengine.desktop} (56%)
>
> diff --git a/browser_apps/browser_webkit/browser_webkit.desktop b/browser_apps/browser_webengine/browser_webengine.desktop
> similarity index 56%
> rename from browser_apps/browser_webkit/browser_webkit.desktop
> rename to browser_apps/browser_webengine/browser_webengine.desktop
> index 7140a4b..53b95ca 100644
> --- a/browser_apps/browser_webkit/browser_webkit.desktop
> +++ b/browser_apps/browser_webengine/browser_webengine.desktop
> @@ -1,12 +1,12 @@
>   #!/usr/bin/env xdg-open
>   
>   [Desktop Entry]
> -Name=Webkit Browser
> +Name=WebEngine Browser
>   GenericName=Demo App
>   Icon=/usr/share/matrix-gui-2.0/apps/images/web-icon.png
> -Exec=/usr/share/qt5/examples/webkitwidgets/browser/browser http://www.ti.com
> +Exec=/usr/share/qt5/examples/webenginewidgets/demobrowser/demobrowser http://www.ti.com
>   Type=Application
>   ProgramType=gui
>   Categories=Browser
>   X-MATRIX-Lock=browser
> -Name[en_US]=browser_webkit.desktop
> +Name[en_US]=browser_webengine.desktop
> diff --git a/qt5_apps/qt5_browser/qt5_browser.desktop b/qt5_apps/qt5_browser/qt5_browser.desktop
> index 2f6636f..a5d3953 100644
> --- a/qt5_apps/qt5_browser/qt5_browser.desktop
> +++ b/qt5_apps/qt5_browser/qt5_browser.desktop
> @@ -4,7 +4,7 @@
>   Name=Browser
>   GenericName=Demo App
>   Icon=/usr/share/matrix-gui-2.0/apps/images/web-icon.png
> -Exec=/usr/share/qt5/examples/webkitwidgets/browser/browser http://www.ti.com
> +Exec=/usr/share/qt5/examples/webenginewidgets/demobrowser/demobrowser http://www.ti.com
>   Type=Application
>   ProgramType=gui
>   Categories=Qt5