diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-11-08 10:20:01 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-11-08 09:50:18 +0000 |
| commit | 9c65c21168765dca83966516551d00d5dccc0682 (patch) | |
| tree | d600960efcbb1bd5f591489c1bcf2869b7dc29fd /recipes-qt/qt5/qtdeclarative_git.bb | |
| parent | a5fd581a113cd27af08099e132d68993e62b9dfb (diff) | |
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 <sami.nurmenniemi@qt.io>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtdeclarative_git.bb | 11 |
1 files changed, 1 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" |