diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2014-02-28 21:15:06 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-03-05 19:03:42 +0100 |
| commit | c9e332597bd461de03dbb0eed429ecbe0c9a05a5 (patch) | |
| tree | c07a3ef319bb60ff9ec22cdb5c271e8febaa8f29 | |
| parent | 69d2f31df603244dff240163df04133756a1a0d3 (diff) | |
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>
| -rw-r--r-- | recipes-qt/qt5/qtdeclarative.inc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index 12e650fa..bd68955b 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc @@ -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)}" |