[oe] [PATCH] qtquick1: fix qtwebkit support

[Alexandre Belloni]

Hi Martin,

Is it possible to backport that patch on krogoth?

Thanks!

On 01/07/2016 at 14:24:49 +0200, 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 at free-electrons.com>
> ---
> 
> Hi Martin,
> 
> We still have that issue in krogoth, with a NODISTRO build.
> 
>  recipes-qt/qt5/qtquick1_git.bb | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
> index 61b02a1..e9c4aa1 100644
> --- a/recipes-qt/qt5/qtquick1_git.bb
> +++ b/recipes-qt/qt5/qtquick1_git.bb
> @@ -17,10 +17,12 @@ DEPENDS += "qtscript qtsvg qtxmlpatterns"
>  # qttools
>  
>  PACKAGECONFIG ??= "webkit"
> -PACKAGECONFIG[webkit] = "CONFIG+=enable-webkit,CONFIG-=enable-webkit,qtwebkit"
> +PACKAGECONFIG[webkit] = ",,qtwebkit"
> +
> +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'webkit', '', '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 = "563ce3888f3c04abcc96ba236b20c7a822bc88e2"
> -- 
> 1.9.1
> 

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