[oe] [meta-qt5][PATCHv1] qtwebengine: Fix build with accessibility enabled

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 ...et_host_view_qt-Fix-build-with-accessibil.patch | 30 ++++++++++++++++++++++
 ...et_host_view_qt-Fix-build-with-accessibil.patch | 30 ++++++++++++++++++++++
 recipes-qt/qt5/qtwebengine_5.4.1.bb                |  1 +
 recipes-qt/qt5/qtwebengine_git.bb                  |  1 +
 4 files changed, 62 insertions(+)
 create mode 100644 recipes-qt/qt5/qtwebengine-git/0004-render_widget_host_view_qt-Fix-build-with-accessibil.patch
 create mode 100644 recipes-qt/qt5/qtwebengine/0005-render_widget_host_view_qt-Fix-build-with-accessibil.patch

diff --git a/recipes-qt/qt5/qtwebengine-git/0004-render_widget_host_view_qt-Fix-build-with-accessibil.patch b/recipes-qt/qt5/qtwebengine-git/0004-render_widget_host_view_qt-Fix-build-with-accessibil.patch
new file mode 100644
index 0000000..e938474
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine-git/0004-render_widget_host_view_qt-Fix-build-with-accessibil.patch
@@ -0,0 +1,30 @@
+From bb798fc9ad6bde88ecfd06841b6f4de8d4543853 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa at gmail.com>
+Date: Thu, 5 Mar 2015 14:58:32 +0100
+Subject: [PATCH 4/4] render_widget_host_view_qt: Fix build with accessibility
+
+* fixes following error when accessibility is enabled:
+  ../../../src/core/render_widget_host_view_qt.cpp:311:12: error: return-statement with a value, in function returning 'void' [-fpermissive]
+  |      return 0;
+
+Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
+---
+ src/core/render_widget_host_view_qt.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
+index 18d64e8..1ca9dea 100644
+--- a/src/core/render_widget_host_view_qt.cpp
++++ b/src/core/render_widget_host_view_qt.cpp
+@@ -308,7 +308,7 @@ void RenderWidgetHostViewQt::CreateBrowserAccessibilityManagerIfNeeded()
+         content::BrowserAccessibilityManagerQt::GetEmptyDocument(),
+         this));
+ #else
+-    return 0;
++    return;
+ #endif // QT_NO_ACCESSIBILITY
+ }
+ 
+-- 
+2.3.1
+
diff --git a/recipes-qt/qt5/qtwebengine/0005-render_widget_host_view_qt-Fix-build-with-accessibil.patch b/recipes-qt/qt5/qtwebengine/0005-render_widget_host_view_qt-Fix-build-with-accessibil.patch
new file mode 100644
index 0000000..a94cb50
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0005-render_widget_host_view_qt-Fix-build-with-accessibil.patch
@@ -0,0 +1,30 @@
+From 039965ecfe950cd530a2a466505cafca2672f155 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa at gmail.com>
+Date: Thu, 5 Mar 2015 14:58:32 +0100
+Subject: [PATCH 5/5] render_widget_host_view_qt: Fix build with accessibility
+
+* fixes following error when accessibility is enabled:
+  ../../../src/core/render_widget_host_view_qt.cpp:311:12: error: return-statement with a value, in function returning 'void' [-fpermissive]
+  |      return 0;
+
+Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
+---
+ src/core/render_widget_host_view_qt.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
+index 18d64e8..1ca9dea 100644
+--- a/src/core/render_widget_host_view_qt.cpp
++++ b/src/core/render_widget_host_view_qt.cpp
+@@ -308,7 +308,7 @@ void RenderWidgetHostViewQt::CreateBrowserAccessibilityManagerIfNeeded()
+         content::BrowserAccessibilityManagerQt::GetEmptyDocument(),
+         this));
+ #else
+-    return 0;
++    return;
+ #endif // QT_NO_ACCESSIBILITY
+ }
+ 
+-- 
+2.3.1
+
diff --git a/recipes-qt/qt5/qtwebengine_5.4.1.bb b/recipes-qt/qt5/qtwebengine_5.4.1.bb
index 867d5bd..e1930f5 100644
--- a/recipes-qt/qt5/qtwebengine_5.4.1.bb
+++ b/recipes-qt/qt5/qtwebengine_5.4.1.bb
@@ -9,5 +9,6 @@ SRC_URI += " \
     file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \
     file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \
     file://0004-Enable-building-Qt-WebEngine-without-accessiblity-en.patch \
+    file://0005-render_widget_host_view_qt-Fix-build-with-accessibil.patch \
     file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \
 "
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 89a83d4..650811c 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -9,6 +9,7 @@ SRC_URI += " \
     file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \
     file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \
     file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \
+    file://0004-render_widget_host_view_qt-Fix-build-with-accessibil.patch \
     file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \
 "
 SRCREV_qtwebengine = "9d1a77b5be56a6a1dade613573eaeea63070969f"
-- 
2.3.1