From 9c65c21168765dca83966516551d00d5dccc0682 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 8 Nov 2018 10:20:01 +0200 Subject: qtxmlpatterns: reverse dependency to qtdeclarative xmllistmodel was moved from qtdeclarative to qtxmlpatterns, which also reverses the dependency of the two modules. Fixes: QTBUG-71656 Change-Id: Ic0a506b634ee72e0122fc1cbb5dd459c4faad735 Reviewed-by: Sami Nurmenniemi Reviewed-by: Mikko Gronoff --- recipes-qt/qt5/qtdeclarative_git.bb | 11 +---------- recipes-qt/qt5/qtxmlpatterns_git.bb | 10 ++++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index f9ab3741..fd79ecc7 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -14,25 +14,16 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -PACKAGECONFIG ??= "qtxmlpatterns qml-debug qml-network ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)}" -PACKAGECONFIG[qtxmlpatterns] = ",,qtxmlpatterns" +PACKAGECONFIG ??= "qml-debug qml-network ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)}" PACKAGECONFIG[qml-debug] = "-qml-debug,-no-qml-debug" PACKAGECONFIG[qml-network] = "-qml-network, -no-qml-network" PACKAGECONFIG[static] = ",,qtdeclarative-native" -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 -} - do_install_append_class-nativesdk() { # qml files not needed in nativesdk rm -rf ${D}${OE_QMAKE_PATH_QML} } -EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" - SRCREV = "0477a057fd02050fd330760bf046f5e0e91a9331" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 5c654731..f4b7f427 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -14,6 +14,16 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" +PACKAGECONFIG ?= "qtdeclarative" +PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative" + +do_configure_prepend() { + # disable qtdeclarative test if it isn't enabled by PACKAGECONFIG + sed -e 's/qtHaveModule(qml)/OE_QTDECLARATIVE_ENABLED/' -i ${S}/src/src.pro +} + +EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" + SRCREV = "803b4cafe125ea18e50e3e6557920b6d705e67f0" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3-54-g00ecf