t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-08 23:24:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

qtquick1: fix qtwebkit support

Browse Source 
40b7a93a3c ("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>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Alexandre Belloni
2016-07-01 14:24:49 +02:00
committed by Martin Jansa
parent 43cbe31c5b
commit 42305c58a2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
recipes-qt/qt5/qtquick1_git.bb
View File

@@ -19,10 +19,12 @@ DEPENDS += "qtscript qtsvg qtxmlpatterns"
SRC_URI += "file://0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch"
PACKAGECONFIG ??= "webkit"
PACKAGECONFIG[webkit] = "CONFIG+=enable-webkit,CONFIG-=enable-webkit,qtwebkit"
PACKAGECONFIG[webkit] = ",,qtwebkit"
EXTRA_QMAKEVARS_PRE += "${@bb.utils.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 = "5e3bd5cb28e7af95b289a617ca2f7a8892498225"