[meta-qt5][master][jethro][PATCH] qtquick1: fix qtwebkit support

[meta-qt5][master][jethro][PATCH] qtquick1: fix qtwebkit support

[Alexandre Belloni]

40b7a93a3c6cf05136c606824c1cea848b75bcb6 ("qtquick1: allow to disable
qtwebkit support") allowed to disable qtwebkit but actually disabled it in
every cases.

Use the same mechanism as qttools to implement the feature.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 recipes-qt/qt5/qtquick1_git.bb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index e0a264d4fa2d..cb5e395b9d67 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -16,11 +16,13 @@ LIC_FILES_CHKSUM = " \
 DEPENDS += "qtscript qtsvg qtxmlpatterns"
 # qttools
 
-PACKAGECONFIG ??= "webkit"
-PACKAGECONFIG[webkit] = "CONFIG+=enable-webkit,CONFIG-=enable-webkit,qtwebkit"
+PACKAGECONFIG ??= "qtwebkit"
+PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
+
+EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
 
 do_configure_prepend() {
-    sed -i 's#^qtHaveModule(webkitwidgets):#enable-webkit:qtHaveModule(webkitwidgets):#g' ${S}/src/imports/imports.pro
+    sed -i 's#^qtHaveModule(webkitwidgets):#qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit):#g' ${S}/src/imports/imports.pro
 }
 
 SRCREV = "87f2415adf34da08e6cd58f5da6f6a7d0d9cf141"
-- 
2.7.0

Re: [meta-qt5][master][jethro][PATCH] qtquick1: fix qtwebkit support

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1771 bytes --]

On Thu, Mar 03, 2016 at 09:52:09AM +0100, Alexandre Belloni wrote:
> 40b7a93a3c6cf05136c606824c1cea848b75bcb6 ("qtquick1: allow to disable
> qtwebkit support") allowed to disable qtwebkit but actually disabled it in
> every cases.
> 
> Use the same mechanism as qttools to implement the feature.
> 
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> ---
>  recipes-qt/qt5/qtquick1_git.bb | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
> index e0a264d4fa2d..cb5e395b9d67 100644
> --- a/recipes-qt/qt5/qtquick1_git.bb
> +++ b/recipes-qt/qt5/qtquick1_git.bb
> @@ -16,11 +16,13 @@ LIC_FILES_CHKSUM = " \
>  DEPENDS += "qtscript qtsvg qtxmlpatterns"
>  # qttools
>  
> -PACKAGECONFIG ??= "webkit"
> -PACKAGECONFIG[webkit] = "CONFIG+=enable-webkit,CONFIG-=enable-webkit,qtwebkit"
> +PACKAGECONFIG ??= "qtwebkit"
> +PACKAGECONFIG[qtwebkit] = ",,qtwebkit"

Is there reason for renaming the packageconfig option?

Where did you see this issue? Weren't you testing master-next with:
http://patchwork.openembedded.org/patch/116717/
without corresponding oe-core change?

> +
> +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
>  
>  do_configure_prepend() {
> -    sed -i 's#^qtHaveModule(webkitwidgets):#enable-webkit:qtHaveModule(webkitwidgets):#g' ${S}/src/imports/imports.pro
> +    sed -i 's#^qtHaveModule(webkitwidgets):#qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit):#g' ${S}/src/imports/imports.pro
>  }
>  
>  SRCREV = "87f2415adf34da08e6cd58f5da6f6a7d0d9cf141"
> -- 
> 2.7.0
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [meta-qt5][master][jethro][PATCH] qtquick1: fix qtwebkit support

[Alexandre Belloni]

On 07/03/2016 at 13:13:24 +0100, Martin Jansa wrote :
> On Thu, Mar 03, 2016 at 09:52:09AM +0100, Alexandre Belloni wrote:
> > 40b7a93a3c6cf05136c606824c1cea848b75bcb6 ("qtquick1: allow to disable
> > qtwebkit support") allowed to disable qtwebkit but actually disabled it in
> > every cases.
> > 
> > Use the same mechanism as qttools to implement the feature.
> > 
> > Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> > ---
> >  recipes-qt/qt5/qtquick1_git.bb | 8 +++++---
> >  1 file changed, 5 insertions(+), 3 deletions(-)
> > 
> > diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
> > index e0a264d4fa2d..cb5e395b9d67 100644
> > --- a/recipes-qt/qt5/qtquick1_git.bb
> > +++ b/recipes-qt/qt5/qtquick1_git.bb
> > @@ -16,11 +16,13 @@ LIC_FILES_CHKSUM = " \
> >  DEPENDS += "qtscript qtsvg qtxmlpatterns"
> >  # qttools
> >  
> > -PACKAGECONFIG ??= "webkit"
> > -PACKAGECONFIG[webkit] = "CONFIG+=enable-webkit,CONFIG-=enable-webkit,qtwebkit"
> > +PACKAGECONFIG ??= "qtwebkit"
> > +PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
> 
> Is there reason for renaming the packageconfig option?
> 

I wanted to align with the qttools option.

> Where did you see this issue? Weren't you testing master-next with:
> http://patchwork.openembedded.org/patch/116717/
> without corresponding oe-core change?
> 

It was on jethro. I'll try a NODISTRO build to see whether this is
caused by poky.


-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Re: [meta-qt5][master][jethro][PATCH] qtquick1: fix qtwebkit support

[Alexandre Belloni]

On 07/03/2016 at 15:19:31 +0100, Alexandre Belloni wrote :
> On 07/03/2016 at 13:13:24 +0100, Martin Jansa wrote :
> > On Thu, Mar 03, 2016 at 09:52:09AM +0100, Alexandre Belloni wrote:
> > > 40b7a93a3c6cf05136c606824c1cea848b75bcb6 ("qtquick1: allow to disable
> > > qtwebkit support") allowed to disable qtwebkit but actually disabled it in
> > > every cases.
> > > 
> > > Use the same mechanism as qttools to implement the feature.
> > > 
> > > Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> > > ---
> > >  recipes-qt/qt5/qtquick1_git.bb | 8 +++++---
> > >  1 file changed, 5 insertions(+), 3 deletions(-)
> > > 
> > > diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
> > > index e0a264d4fa2d..cb5e395b9d67 100644
> > > --- a/recipes-qt/qt5/qtquick1_git.bb
> > > +++ b/recipes-qt/qt5/qtquick1_git.bb
> > > @@ -16,11 +16,13 @@ LIC_FILES_CHKSUM = " \
> > >  DEPENDS += "qtscript qtsvg qtxmlpatterns"
> > >  # qttools
> > >  
> > > -PACKAGECONFIG ??= "webkit"
> > > -PACKAGECONFIG[webkit] = "CONFIG+=enable-webkit,CONFIG-=enable-webkit,qtwebkit"
> > > +PACKAGECONFIG ??= "qtwebkit"
> > > +PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
> > 
> > Is there reason for renaming the packageconfig option?
> > 
> 
> I wanted to align with the qttools option.
> 
> > Where did you see this issue? Weren't you testing master-next with:
> > http://patchwork.openembedded.org/patch/116717/
> > without corresponding oe-core change?
> > 
> 
> It was on jethro. I'll try a NODISTRO build to see whether this is
> caused by poky.
> 

So I did a nodistro build and I can reproduce the issue on Jethro. The
dependency on qtwebkit works properly but CONFIG is not passed so it
does not contain "enable-webkit".




-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com