From c9e332597bd461de03dbb0eed429ecbe0c9a05a5 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Fri, 28 Feb 2014 21:15:06 +0100 Subject: [PATCH] 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 Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtdeclarative.inc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index 12e650fae2..bd68955b4c 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)}"