[oe] [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 at 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