[PATCH][meta-qt5 1/4] qtbase: create empty oe-device-extra.pri

[PATCH][meta-qt5 1/4] qtbase: create empty oe-device-extra.pri

[Martin Jansa]

From: Herve Jourdain <herve.jourdain@neuf.fr>

During configure, it complains it can't find oe-device-extra.pri,
but it doesn't result in any error. Fix it, though, just in case.

Signed-off-by: Herve Jourdain <herve.jourdain@neuf.fr>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes-qt/qt5/qtbase_git.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 354a01c..5db9aad 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -130,6 +130,9 @@ QT_CONFIG_FLAGS += " \
 "
 
 do_configure() {
+    # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" during configuration
+    touch ${S}/mkspecs/oe-device-extra.pri
+
     ${S}/configure -v \
         -opensource -confirm-license \
         -sysroot ${STAGING_DIR_TARGET} \
-- 
2.10.2

[PATCH][meta-qt5 2/4] qtwayland: Add libxkbcommon in the dependencies

[Martin Jansa]

From: Herve Jourdain <herve.jourdain@neuf.fr>

xkb should be optional, but it's not for the moment, so add it to the
dependencies.

Signed-off-by: Herve Jourdain <herve.jourdain@neuf.fr>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes-qt/qt5/qtwayland_git.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index ec41922..21abd54 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -2,6 +2,7 @@ require qt5.inc
 require qt5-git.inc
 
 DEPENDS += "qtbase qtdeclarative wayland wayland-native qtwayland-native"
+DEPENDS_append_class-target = " libxkbcommon"
 
 LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
 LIC_FILES_CHKSUM = " \
-- 
2.10.2

[PATCH][meta-qt5 3/4] qtwayland: fix build without xkbcommon-evdev

[Martin Jansa]

* xkbcommon-evdev isn't enabled in default qtbase PACKAGECONFIG
* use patch from https://bugreports.qt.io/browse/QTBUG-57767

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../0001-fix-build-without-xkbcommon-evdev.patch   | 44 ++++++++++++++++++++++
 recipes-qt/qt5/qtwayland_git.bb                    |  3 ++
 2 files changed, 47 insertions(+)
 create mode 100644 recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch

diff --git a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
new file mode 100644
index 0000000..e1e978e
--- /dev/null
+++ b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
@@ -0,0 +1,44 @@
+From c93dbe53e8a1b2203c750a66c7efe6fc9a326903 Mon Sep 17 00:00:00 2001
+From: Raphael Freudiger <raphael.freudiger@siemens.com>
+Date: Thu, 22 Dec 2016 13:54:31 +0100
+Subject: [PATCH] fix build without xkbcommon-evdev
+
+Signed-off-by: Raphael Freudiger <raphael.freudiger@siemens.com>
+---
+ src/compositor/compositor_api/qwaylandkeyboard.cpp | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp
+index 55381b4..5c054c6 100644
+--- a/src/compositor/compositor_api/qwaylandkeyboard.cpp
++++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp
+@@ -338,12 +338,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap)
+     xkb_state = xkb_state_new(keymap);
+ }
+ 
+-uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uint nativeScanCode)
+-{
+-    const uint offset = 8;
+-    Q_ASSERT(nativeScanCode >= offset);
+-    return nativeScanCode - offset;
+-}
+ 
+ void QWaylandKeyboardPrivate::createXKBKeymap()
+ {
+@@ -373,6 +367,13 @@ void QWaylandKeyboardPrivate::createXKBKeymap()
+ }
+ #endif
+ 
++uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uint nativeScanCode)
++{
++    const uint offset = 8;
++    Q_ASSERT(nativeScanCode >= offset);
++    return nativeScanCode - offset;
++}
++
+ void QWaylandKeyboardPrivate::sendRepeatInfo()
+ {
+     Q_FOREACH (Resource *resource, resourceMap()) {
+-- 
+2.1.4
+
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 21abd54..d42d80a 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -43,4 +43,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 
 SRCREV = "0e2a950895805457a45abe860bc91a7cc4ba405e"
 
+# From https://bugreports.qt.io/browse/QTBUG-57767
+SRC_URI += "file://0001-fix-build-without-xkbcommon-evdev.patch"
+
 BBCLASSEXTEND =+ "native nativesdk"
-- 
2.10.2

Re: [PATCH][meta-qt5 3/4] qtwayland: fix build without xkbcommon-evdev

[Martin Jansa]

This isn't enough at least in some setups, but it's good start (it works
after you add -lxkbcommon in 2 incorrectly generated Makefiles) and at
least it documents that xkbcommon-evdev is now needed to be set in qtbase
PACKAGECONFIG.

On Fri, Feb 3, 2017 at 12:54 AM, Martin Jansa <martin.jansa@gmail.com>
wrote:

> * xkbcommon-evdev isn't enabled in default qtbase PACKAGECONFIG
> * use patch from https://bugreports.qt.io/browse/QTBUG-57767
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  .../0001-fix-build-without-xkbcommon-evdev.patch   | 44
> ++++++++++++++++++++++
>  recipes-qt/qt5/qtwayland_git.bb                    |  3 ++
>  2 files changed, 47 insertions(+)
>  create mode 100644 recipes-qt/qt5/qtwayland/0001-
> fix-build-without-xkbcommon-evdev.patch
>
> diff --git a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
> b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
> new file mode 100644
> index 0000000..e1e978e
> --- /dev/null
> +++ b/recipes-qt/qt5/qtwayland/0001-fix-build-without-
> xkbcommon-evdev.patch
> @@ -0,0 +1,44 @@
> +From c93dbe53e8a1b2203c750a66c7efe6fc9a326903 Mon Sep 17 00:00:00 2001
> +From: Raphael Freudiger <raphael.freudiger@siemens.com>
> +Date: Thu, 22 Dec 2016 13:54:31 +0100
> +Subject: [PATCH] fix build without xkbcommon-evdev
> +
> +Signed-off-by: Raphael Freudiger <raphael.freudiger@siemens.com>
> +---
> + src/compositor/compositor_api/qwaylandkeyboard.cpp | 13 +++++++------
> + 1 file changed, 7 insertions(+), 6 deletions(-)
> +
> +diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp
> b/src/compositor/compositor_api/qwaylandkeyboard.cpp
> +index 55381b4..5c054c6 100644
> +--- a/src/compositor/compositor_api/qwaylandkeyboard.cpp
> ++++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp
> +@@ -338,12 +338,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap
> *keymap)
> +     xkb_state = xkb_state_new(keymap);
> + }
> +
> +-uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uint
> nativeScanCode)
> +-{
> +-    const uint offset = 8;
> +-    Q_ASSERT(nativeScanCode >= offset);
> +-    return nativeScanCode - offset;
> +-}
> +
> + void QWaylandKeyboardPrivate::createXKBKeymap()
> + {
> +@@ -373,6 +367,13 @@ void QWaylandKeyboardPrivate::createXKBKeymap()
> + }
> + #endif
> +
> ++uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uint
> nativeScanCode)
> ++{
> ++    const uint offset = 8;
> ++    Q_ASSERT(nativeScanCode >= offset);
> ++    return nativeScanCode - offset;
> ++}
> ++
> + void QWaylandKeyboardPrivate::sendRepeatInfo()
> + {
> +     Q_FOREACH (Resource *resource, resourceMap()) {
> +--
> +2.1.4
> +
> diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_
> git.bb
> index 21abd54..d42d80a 100644
> --- a/recipes-qt/qt5/qtwayland_git.bb
> +++ b/recipes-qt/qt5/qtwayland_git.bb
> @@ -43,4 +43,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
>
>  SRCREV = "0e2a950895805457a45abe860bc91a7cc4ba405e"
>
> +# From https://bugreports.qt.io/browse/QTBUG-57767
> +SRC_URI += "file://0001-fix-build-without-xkbcommon-evdev.patch"
> +
>  BBCLASSEXTEND =+ "native nativesdk"
> --
> 2.10.2
>
>

Re: [PATCH][meta-qt5 3/4] qtwayland: fix build without xkbcommon-evdev

[Denys Dmytriyenko]

On Fri, Feb 03, 2017 at 01:00:16AM +0100, Martin Jansa wrote:
> This isn't enough at least in some setups, but it's good start (it works
> after you add -lxkbcommon in 2 incorrectly generated Makefiles) and at
> least it documents that xkbcommon-evdev is now needed to be set in qtbase
> PACKAGECONFIG.

Can qtwayland 5.8 be built w/o "x11" in DISTRO_FEATURES?

I have X-less setup and obviously don't get xkbcommon-evdev in PACKAGECONFIG, 
thus:

| /usr/src/debug/qtwayland/5.8.0+gitAUTOINC+0e2a950895-r0/git/src/shared/qwaylandxkb.cpp:297: error: undefined reference to 'xkb_keysym_to_utf32'
| /usr/src/debug/qtwayland/5.8.0+gitAUTOINC+0e2a950895-r0/git/src/shared/qwaylandxkb.cpp:337: error: undefined reference to 'xkb_state_mod_name_is_active'
| /usr/src/debug/qtwayland/5.8.0+gitAUTOINC+0e2a950895-r0/git/src/shared/qwaylandxkb.cpp:339: error: undefined reference to 'xkb_state_mod_name_is_active'
| /usr/src/debug/qtwayland/5.8.0+gitAUTOINC+0e2a950895-r0/git/src/shared/qwaylandxkb.cpp:341: error: undefined reference to 'xkb_state_mod_name_is_active'
| /usr/src/debug/qtwayland/5.8.0+gitAUTOINC+0e2a950895-r0/git/src/shared/qwaylandxkb.cpp:343: error: undefined reference to 'xkb_state_mod_name_is_active'

-- 
Denys


> On Fri, Feb 3, 2017 at 12:54 AM, Martin Jansa <martin.jansa@gmail.com>
> wrote:
> 
> > * xkbcommon-evdev isn't enabled in default qtbase PACKAGECONFIG
> > * use patch from https://bugreports.qt.io/browse/QTBUG-57767
> >
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >  .../0001-fix-build-without-xkbcommon-evdev.patch   | 44
> > ++++++++++++++++++++++
> >  recipes-qt/qt5/qtwayland_git.bb                    |  3 ++
> >  2 files changed, 47 insertions(+)
> >  create mode 100644 recipes-qt/qt5/qtwayland/0001-
> > fix-build-without-xkbcommon-evdev.patch
> >
> > diff --git a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
> > b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
> > new file mode 100644
> > index 0000000..e1e978e
> > --- /dev/null
> > +++ b/recipes-qt/qt5/qtwayland/0001-fix-build-without-
> > xkbcommon-evdev.patch
> > @@ -0,0 +1,44 @@
> > +From c93dbe53e8a1b2203c750a66c7efe6fc9a326903 Mon Sep 17 00:00:00 2001
> > +From: Raphael Freudiger <raphael.freudiger@siemens.com>
> > +Date: Thu, 22 Dec 2016 13:54:31 +0100
> > +Subject: [PATCH] fix build without xkbcommon-evdev
> > +
> > +Signed-off-by: Raphael Freudiger <raphael.freudiger@siemens.com>
> > +---
> > + src/compositor/compositor_api/qwaylandkeyboard.cpp | 13 +++++++------
> > + 1 file changed, 7 insertions(+), 6 deletions(-)
> > +
> > +diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp
> > b/src/compositor/compositor_api/qwaylandkeyboard.cpp
> > +index 55381b4..5c054c6 100644
> > +--- a/src/compositor/compositor_api/qwaylandkeyboard.cpp
> > ++++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp
> > +@@ -338,12 +338,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap
> > *keymap)
> > +     xkb_state = xkb_state_new(keymap);
> > + }
> > +
> > +-uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uint
> > nativeScanCode)
> > +-{
> > +-    const uint offset = 8;
> > +-    Q_ASSERT(nativeScanCode >= offset);
> > +-    return nativeScanCode - offset;
> > +-}
> > +
> > + void QWaylandKeyboardPrivate::createXKBKeymap()
> > + {
> > +@@ -373,6 +367,13 @@ void QWaylandKeyboardPrivate::createXKBKeymap()
> > + }
> > + #endif
> > +
> > ++uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uint
> > nativeScanCode)
> > ++{
> > ++    const uint offset = 8;
> > ++    Q_ASSERT(nativeScanCode >= offset);
> > ++    return nativeScanCode - offset;
> > ++}
> > ++
> > + void QWaylandKeyboardPrivate::sendRepeatInfo()
> > + {
> > +     Q_FOREACH (Resource *resource, resourceMap()) {
> > +--
> > +2.1.4
> > +
> > diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_
> > git.bb
> > index 21abd54..d42d80a 100644
> > --- a/recipes-qt/qt5/qtwayland_git.bb
> > +++ b/recipes-qt/qt5/qtwayland_git.bb
> > @@ -43,4 +43,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
> >
> >  SRCREV = "0e2a950895805457a45abe860bc91a7cc4ba405e"
> >
> > +# From https://bugreports.qt.io/browse/QTBUG-57767
> > +SRC_URI += "file://0001-fix-build-without-xkbcommon-evdev.patch"
> > +
> >  BBCLASSEXTEND =+ "native nativesdk"
> > --
> > 2.10.2
> >
> >
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [PATCH][meta-qt5 3/4] qtwayland: fix build without xkbcommon-evdev

[Martin Jansa]

Yes, it can be built, but you need to enable xkbcommon-evdev which works
even in DISTROs without x11, like I did in:
https://github.com/webOS-ports/meta-webos-ports/commit/03e259ca0fd95b38bf985064a8e9d2eb47a8a59f

On Fri, Mar 3, 2017 at 12:37 AM, Denys Dmytriyenko <denis@denix.org> wrote:

> On Fri, Feb 03, 2017 at 01:00:16AM +0100, Martin Jansa wrote:
> > This isn't enough at least in some setups, but it's good start (it works
> > after you add -lxkbcommon in 2 incorrectly generated Makefiles) and at
> > least it documents that xkbcommon-evdev is now needed to be set in qtbase
> > PACKAGECONFIG.
>
> Can qtwayland 5.8 be built w/o "x11" in DISTRO_FEATURES?
>
> I have X-less setup and obviously don't get xkbcommon-evdev in
> PACKAGECONFIG,
> thus:
>
> | /usr/src/debug/qtwayland/5.8.0+gitAUTOINC+0e2a950895-r0/
> git/src/shared/qwaylandxkb.cpp:297: error: undefined reference to
> 'xkb_keysym_to_utf32'
> | /usr/src/debug/qtwayland/5.8.0+gitAUTOINC+0e2a950895-r0/
> git/src/shared/qwaylandxkb.cpp:337: error: undefined reference to
> 'xkb_state_mod_name_is_active'
> | /usr/src/debug/qtwayland/5.8.0+gitAUTOINC+0e2a950895-r0/
> git/src/shared/qwaylandxkb.cpp:339: error: undefined reference to
> 'xkb_state_mod_name_is_active'
> | /usr/src/debug/qtwayland/5.8.0+gitAUTOINC+0e2a950895-r0/
> git/src/shared/qwaylandxkb.cpp:341: error: undefined reference to
> 'xkb_state_mod_name_is_active'
> | /usr/src/debug/qtwayland/5.8.0+gitAUTOINC+0e2a950895-r0/
> git/src/shared/qwaylandxkb.cpp:343: error: undefined reference to
> 'xkb_state_mod_name_is_active'
>
> --
> Denys
>
>
> > On Fri, Feb 3, 2017 at 12:54 AM, Martin Jansa <martin.jansa@gmail.com>
> > wrote:
> >
> > > * xkbcommon-evdev isn't enabled in default qtbase PACKAGECONFIG
> > > * use patch from https://bugreports.qt.io/browse/QTBUG-57767
> > >
> > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > > ---
> > >  .../0001-fix-build-without-xkbcommon-evdev.patch   | 44
> > > ++++++++++++++++++++++
> > >  recipes-qt/qt5/qtwayland_git.bb                    |  3 ++
> > >  2 files changed, 47 insertions(+)
> > >  create mode 100644 recipes-qt/qt5/qtwayland/0001-
> > > fix-build-without-xkbcommon-evdev.patch
> > >
> > > diff --git a/recipes-qt/qt5/qtwayland/0001-fix-build-without-
> xkbcommon-evdev.patch
> > > b/recipes-qt/qt5/qtwayland/0001-fix-build-without-
> xkbcommon-evdev.patch
> > > new file mode 100644
> > > index 0000000..e1e978e
> > > --- /dev/null
> > > +++ b/recipes-qt/qt5/qtwayland/0001-fix-build-without-
> > > xkbcommon-evdev.patch
> > > @@ -0,0 +1,44 @@
> > > +From c93dbe53e8a1b2203c750a66c7efe6fc9a326903 Mon Sep 17 00:00:00
> 2001
> > > +From: Raphael Freudiger <raphael.freudiger@siemens.com>
> > > +Date: Thu, 22 Dec 2016 13:54:31 +0100
> > > +Subject: [PATCH] fix build without xkbcommon-evdev
> > > +
> > > +Signed-off-by: Raphael Freudiger <raphael.freudiger@siemens.com>
> > > +---
> > > + src/compositor/compositor_api/qwaylandkeyboard.cpp | 13
> +++++++------
> > > + 1 file changed, 7 insertions(+), 6 deletions(-)
> > > +
> > > +diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp
> > > b/src/compositor/compositor_api/qwaylandkeyboard.cpp
> > > +index 55381b4..5c054c6 100644
> > > +--- a/src/compositor/compositor_api/qwaylandkeyboard.cpp
> > > ++++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp
> > > +@@ -338,12 +338,6 @@ void QWaylandKeyboardPrivate::
> createXKBState(xkb_keymap
> > > *keymap)
> > > +     xkb_state = xkb_state_new(keymap);
> > > + }
> > > +
> > > +-uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uint
> > > nativeScanCode)
> > > +-{
> > > +-    const uint offset = 8;
> > > +-    Q_ASSERT(nativeScanCode >= offset);
> > > +-    return nativeScanCode - offset;
> > > +-}
> > > +
> > > + void QWaylandKeyboardPrivate::createXKBKeymap()
> > > + {
> > > +@@ -373,6 +367,13 @@ void QWaylandKeyboardPrivate::createXKBKeymap()
> > > + }
> > > + #endif
> > > +
> > > ++uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uint
> > > nativeScanCode)
> > > ++{
> > > ++    const uint offset = 8;
> > > ++    Q_ASSERT(nativeScanCode >= offset);
> > > ++    return nativeScanCode - offset;
> > > ++}
> > > ++
> > > + void QWaylandKeyboardPrivate::sendRepeatInfo()
> > > + {
> > > +     Q_FOREACH (Resource *resource, resourceMap()) {
> > > +--
> > > +2.1.4
> > > +
> > > diff --git a/recipes-qt/qt5/qtwayland_git.bb
> b/recipes-qt/qt5/qtwayland_
> > > git.bb
> > > index 21abd54..d42d80a 100644
> > > --- a/recipes-qt/qt5/qtwayland_git.bb
> > > +++ b/recipes-qt/qt5/qtwayland_git.bb
> > > @@ -43,4 +43,7 @@ EXTRA_QMAKEVARS_CONFIGURE +=
> "${PACKAGECONFIG_CONFARGS}"
> > >
> > >  SRCREV = "0e2a950895805457a45abe860bc91a7cc4ba405e"
> > >
> > > +# From https://bugreports.qt.io/browse/QTBUG-57767
> > > +SRC_URI += "file://0001-fix-build-without-xkbcommon-evdev.patch"
> > > +
> > >  BBCLASSEXTEND =+ "native nativesdk"
> > > --
> > > 2.10.2
> > >
> > >
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

[PATCH][meta-qt5 4/4] qtwebengine: disable generate_character_data

[Martin Jansa]

* qtwebengine 5.8 fails to build it, because it mixes binaries for x86_64 host and x86 target when building for qemux86 on 64bit host
  https://bugreports.qt.io/browse/QTBUG-57705

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes-qt/qt5/qtwebengine_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 4ab30ea..3d139d0 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -24,7 +24,7 @@ DEPENDS += " \
 "
 
 DEPENDS += "yasm-native"
-EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm"
+EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm GYP_CONFIG+=generate_character_data=0"
 
 # To use system ffmpeg you need to enable also libwebp, opus, vpx											    
 # Only depenedencies available in oe-core are enabled by default
-- 
2.10.2