Re: [oe] [meta-qt5][PATCHv2] fix build of qtwebengine if qtbase has no accessibility

2015-03-05 Thread Stephan Binner 
On Thursday 05 March 2015 15:04:03 Martin Jansa wrote:

 I've sent additional patch to fix building with accessibility enabled.

You mean without accessibility :-)... (damn double negation #ifdef)

 Please get it merged in upstream, because your patch seems to be broken

It's merged in 5.4 branch: https://codereview.qt-project.org/#/c/107873/

Regards,
Stephan

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [meta-qt5][PATCHv2] fix build of qtwebengine if qtbase has no accessibility

2015-03-03 Thread Martin Jansa 
From: Stephan Binner stephan.bin...@basyskom.com

Signed-off-by: Stephan Binner stephan.bin...@basyskom.com
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
 recipes-qt/qt5/qtbase.inc  |   2 +-
 ...ding-Qt-WebEngine-without-accessiblity-en.patch | 533 +
 ...ding-Qt-WebEngine-without-accessiblity-en.patch | 533 +
 recipes-qt/qt5/qtwebengine_5.4.1.bb|   1 +
 recipes-qt/qt5/qtwebengine_git.bb  |   1 +
 5 files changed, 1069 insertions(+), 1 deletion(-)
 create mode 100644 
recipes-qt/qt5/qtwebengine-git/0004-Enable-building-Qt-WebEngine-without-accessiblity-en.patch
 create mode 100644 
recipes-qt/qt5/qtwebengine/0004-Enable-building-Qt-WebEngine-without-accessiblity-en.patch

diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index c6fe358..d7c027f 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -64,7 +64,7 @@ PACKAGECONFIG[examples] = -make examples 
-compile-examples,-nomake examples
 PACKAGECONFIG[tools] = -make tools,-nomake tools
 # only for completeness, configure will add libs even if you try to explicitly 
remove it
 PACKAGECONFIG[libs] = -make libs,-nomake libs
-# accessibility is required to compile qtquickcontrols and qtwebengine
+# accessibility is required to compile qtquickcontrols
 PACKAGECONFIG[accessibility] = -accessibility,-no-accessibility
 PACKAGECONFIG[glib] = -glib,-no-glib,glib-2.0
 # use either system freetype or bundled freetype, if you disable freetype 
completely
diff --git 
a/recipes-qt/qt5/qtwebengine-git/0004-Enable-building-Qt-WebEngine-without-accessiblity-en.patch
 
b/recipes-qt/qt5/qtwebengine-git/0004-Enable-building-Qt-WebEngine-without-accessiblity-en.patch
new file mode 100644
index 000..8a4c216
--- /dev/null
+++ 
b/recipes-qt/qt5/qtwebengine-git/0004-Enable-building-Qt-WebEngine-without-accessiblity-en.patch
@@ -0,0 +1,533 @@
+From 8328f6941685d8a525629b9c0717dbab321fc09e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20Br=C3=BCning?= michael.brun...@theqtcompany.com
+Date: Tue, 20 Jan 2015 16:20:42 +0100
+Subject: [PATCH 4/4] Enable building Qt WebEngine without accessiblity
+ enabled.
+
+This adds guards that for QT_NO_ACCESSIBILITY being not defined
+around the code that uses accessibility types.
+
+It disables the quicknanobrowser and quicktestbrowser examples
+which need Qt QuickControls, which has a hard dependency to
+accessibility being enabled.
+
+Task-number: QTBUG-43305
+Change-Id: Ifa39e3ce447ebc2124f52e00b29b1d7d2231035e
+Reviewed-by: Andras Becsi andras.be...@theqtcompany.com
+
+Upstream-Status: Backport from 5.5
+https://codereview.qt-project.org/#/c/104207/
+---
+ examples/webengine/quicknanobrowser/quicknanobrowser.pro |  2 ++
+ src/core/browser_accessibility_manager_qt.cpp|  6 ++
+ src/core/browser_accessibility_manager_qt.h  |  2 ++
+ src/core/browser_accessibility_qt.cpp|  4 
+ src/core/browser_accessibility_qt.h  |  3 +++
+ src/core/render_widget_host_view_qt.cpp  | 13 -
+ src/core/render_widget_host_view_qt.h|  6 +-
+ src/core/web_contents_adapter.cpp|  2 ++
+ src/core/web_contents_adapter_client.h   |  2 ++
+ src/webengine/api/qquickwebengineview.cpp| 12 
+ src/webengine/api/qquickwebengineview_p.h|  2 ++
+ src/webengine/api/qquickwebengineview_p_p.h  |  5 -
+ src/webenginewidgets/api/qwebenginepage.cpp  |  3 +++
+ src/webenginewidgets/api/qwebenginepage.h|  2 ++
+ src/webenginewidgets/api/qwebenginepage_p.h  |  2 ++
+ src/webenginewidgets/api/qwebengineview.cpp  |  7 ++-
+ src/webenginewidgets/api/qwebengineview_p.h  |  3 ++-
+ tests/quicktestbrowser/quicktestbrowser.pro  |  2 ++
+ 18 files changed, 73 insertions(+), 5 deletions(-)
+
+diff --git a/examples/webengine/quicknanobrowser/quicknanobrowser.pro 
b/examples/webengine/quicknanobrowser/quicknanobrowser.pro
+index 3628b81..a8e57b0 100644
+--- a/examples/webengine/quicknanobrowser/quicknanobrowser.pro
 b/examples/webengine/quicknanobrowser/quicknanobrowser.pro
+@@ -1,3 +1,5 @@
++requires(contains(QT_CONFIG, accessibility))
++
+ TEMPLATE = app
+ TARGET = quicknanobrowser
+ 
+diff --git a/src/core/browser_accessibility_manager_qt.cpp 
b/src/core/browser_accessibility_manager_qt.cpp
+index 28d0dd7..6729866 100644
+--- a/src/core/browser_accessibility_manager_qt.cpp
 b/src/core/browser_accessibility_manager_qt.cpp
+@@ -45,9 +45,14 @@ namespace content {
+ 
+ BrowserAccessibility *BrowserAccessibilityFactoryQt::Create()
+ {
++#ifndef QT_NO_ACCESSIBILITY
+ return new BrowserAccessibilityQt();
++#else
++return 0;
++#endif // QT_NO_ACCESSIBILITY
+ }
+ 
++#ifndef QT_NO_ACCESSIBILITY
+

Re: [oe] [meta-qt5][PATCHv2] fix build of qtwebengine if qtbase has no accessibility

2015-03-03 Thread Martin Jansa 
On Tue, Mar 03, 2015 at 08:40:09PM +0100, Martin Jansa wrote:
 From: Stephan Binner stephan.bin...@basyskom.com
 
 Signed-off-by: Stephan Binner stephan.bin...@basyskom.com
 Signed-off-by: Martin Jansa martin.ja...@gmail.com
 ---
  recipes-qt/qt5/qtbase.inc  |   2 +-
  ...ding-Qt-WebEngine-without-accessiblity-en.patch | 533 
 +
  ...ding-Qt-WebEngine-without-accessiblity-en.patch | 533 
 +
  recipes-qt/qt5/qtwebengine_5.4.1.bb|   1 +
  recipes-qt/qt5/qtwebengine_git.bb  |   1 +
  5 files changed, 1069 insertions(+), 1 deletion(-)
  create mode 100644 
 recipes-qt/qt5/qtwebengine-git/0004-Enable-building-Qt-WebEngine-without-accessiblity-en.patch
  create mode 100644 
 recipes-qt/qt5/qtwebengine/0004-Enable-building-Qt-WebEngine-without-accessiblity-en.patch
 
 diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
 index c6fe358..d7c027f 100644
 --- a/recipes-qt/qt5/qtbase.inc
 +++ b/recipes-qt/qt5/qtbase.inc
 @@ -64,7 +64,7 @@ PACKAGECONFIG[examples] = -make examples 
 -compile-examples,-nomake examples
  PACKAGECONFIG[tools] = -make tools,-nomake tools
  # only for completeness, configure will add libs even if you try to 
 explicitly remove it
  PACKAGECONFIG[libs] = -make libs,-nomake libs
 -# accessibility is required to compile qtquickcontrols and qtwebengine
 +# accessibility is required to compile qtquickcontrols
  PACKAGECONFIG[accessibility] = -accessibility,-no-accessibility
  PACKAGECONFIG[glib] = -glib,-no-glib,glib-2.0
  # use either system freetype or bundled freetype, if you disable freetype 
 completely
 diff --git 
 a/recipes-qt/qt5/qtwebengine-git/0004-Enable-building-Qt-WebEngine-without-accessiblity-en.patch
  
 b/recipes-qt/qt5/qtwebengine-git/0004-Enable-building-Qt-WebEngine-without-accessiblity-en.patch
 new file mode 100644
 index 000..8a4c216
 --- /dev/null
 +++ 
 b/recipes-qt/qt5/qtwebengine-git/0004-Enable-building-Qt-WebEngine-without-accessiblity-en.patch
 @@ -0,0 +1,533 @@
 +From 8328f6941685d8a525629b9c0717dbab321fc09e Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?Michael=20Br=C3=BCning?= michael.brun...@theqtcompany.com
 +Date: Tue, 20 Jan 2015 16:20:42 +0100
 +Subject: [PATCH 4/4] Enable building Qt WebEngine without accessiblity
 + enabled.
 +
 +This adds guards that for QT_NO_ACCESSIBILITY being not defined
 +around the code that uses accessibility types.
 +
 +It disables the quicknanobrowser and quicktestbrowser examples
 +which need Qt QuickControls, which has a hard dependency to
 +accessibility being enabled.
 +
 +Task-number: QTBUG-43305
 +Change-Id: Ifa39e3ce447ebc2124f52e00b29b1d7d2231035e
 +Reviewed-by: Andras Becsi andras.be...@theqtcompany.com
 +
 +Upstream-Status: Backport from 5.5
 +https://codereview.qt-project.org/#/c/104207/
 +---
 + examples/webengine/quicknanobrowser/quicknanobrowser.pro |  2 ++
 + src/core/browser_accessibility_manager_qt.cpp|  6 ++
 + src/core/browser_accessibility_manager_qt.h  |  2 ++
 + src/core/browser_accessibility_qt.cpp|  4 
 + src/core/browser_accessibility_qt.h  |  3 +++
 + src/core/render_widget_host_view_qt.cpp  | 13 -
 + src/core/render_widget_host_view_qt.h|  6 +-
 + src/core/web_contents_adapter.cpp|  2 ++
 + src/core/web_contents_adapter_client.h   |  2 ++
 + src/webengine/api/qquickwebengineview.cpp| 12 
 + src/webengine/api/qquickwebengineview_p.h|  2 ++
 + src/webengine/api/qquickwebengineview_p_p.h  |  5 -
 + src/webenginewidgets/api/qwebenginepage.cpp  |  3 +++
 + src/webenginewidgets/api/qwebenginepage.h|  2 ++
 + src/webenginewidgets/api/qwebenginepage_p.h  |  2 ++
 + src/webenginewidgets/api/qwebengineview.cpp  |  7 ++-
 + src/webenginewidgets/api/qwebengineview_p.h  |  3 ++-
 + tests/quicktestbrowser/quicktestbrowser.pro  |  2 ++
 + 18 files changed, 73 insertions(+), 5 deletions(-)
 +
 +diff --git a/examples/webengine/quicknanobrowser/quicknanobrowser.pro 
 b/examples/webengine/quicknanobrowser/quicknanobrowser.pro
 +index 3628b81..a8e57b0 100644
 +--- a/examples/webengine/quicknanobrowser/quicknanobrowser.pro
  b/examples/webengine/quicknanobrowser/quicknanobrowser.pro
 +@@ -1,3 +1,5 @@
 ++requires(contains(QT_CONFIG, accessibility))
 ++
 + TEMPLATE = app
 + TARGET = quicknanobrowser
 + 
 +diff --git a/src/core/browser_accessibility_manager_qt.cpp 
 b/src/core/browser_accessibility_manager_qt.cpp
 +index 28d0dd7..6729866 100644
 +--- a/src/core/browser_accessibility_manager_qt.cpp
  b/src/core/browser_accessibility_manager_qt.cpp
 +@@ -45,9 +45,14 @@ namespace content {
 + 
 + BrowserAccessibility *BrowserAccessibilityFactoryQt::Create()
 + {
 ++#ifndef QT_NO_ACCESSIBILITY
 + return new