sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

qtdeclarative: drop qtsvg dependency, add packageconfig for qtxmlpatterns 

The dependency on qtsvg seems to be a leftover from an old version.
Version 5.2.1 of qtdeclarative doesn't include any reference to it.

Depend on qtbase in case qtxmlpatterns gets disabled.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Andreas Oberritter 2014-02-28 21:15:06 +01:00 committed by Martin Jansa
parent 69d2f31df6
commit c9e332597b
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
recipes-qt/qt5/qtdeclarative.inc
View File

@ -5,4 +5,15 @@ SRC_URI += " \
file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \
"
DEPENDS += "qtsvg qtxmlpatterns"
DEPENDS += "qtbase"
PACKAGECONFIG ??= "qtxmlpatterns"
PACKAGECONFIG[qtxmlpatterns] = ",,qtxmlpatterns"
do_configure_prepend() {
# disable qtxmlpatterns test if it isn't enabled by PACKAGECONFIG
sed -e 's/^\(qtHaveModule(xmlpatterns)\)/OE_QTXMLPATTERNS_ENABLED:\1/' -i ${S}/src/imports/imports.pro
sed -e 's/^\(!qtHaveModule(xmlpatterns)\)/!OE_QTXMLPATTERNS_ENABLED|\1/' -i ${S}/tests/auto/quick/quick.pro
}
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"