diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-07-04 10:20:19 +0300 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-21 21:01:45 +0000 |
commit | b7b0a78d8e5aef81f3cc1089318293d1f238e7df (patch) | |
tree | 923b86e8ec598be3706de117eefbeda02e483ff5 /recipes-qt/qt5/qtdeclarative_git.bb | |
parent | 57aab3137a898f71adaf760fccbb180ecac2ebd4 (diff) | |
download | meta-qt5-b7b0a78d8e5aef81f3cc1089318293d1f238e7df.tar.gz |
qtdeclarative: remove qtxmlpatterns PACKAGECONFIG
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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 b09e96e7..56a98eaa 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -14,25 +14,16 @@ LIC_FILES_CHKSUM = " \ | |||
14 | 14 | ||
15 | DEPENDS += "qtbase" | 15 | DEPENDS += "qtbase" |
16 | 16 | ||
17 | PACKAGECONFIG ??= "qtxmlpatterns qml-debug qml-network ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)}" | 17 | PACKAGECONFIG ??= "qml-debug qml-network ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)}" |
18 | PACKAGECONFIG[qtxmlpatterns] = ",,qtxmlpatterns" | ||
19 | PACKAGECONFIG[qml-debug] = "-qml-debug,-no-qml-debug" | 18 | PACKAGECONFIG[qml-debug] = "-qml-debug,-no-qml-debug" |
20 | PACKAGECONFIG[qml-network] = "-qml-network, -no-qml-network" | 19 | PACKAGECONFIG[qml-network] = "-qml-network, -no-qml-network" |
21 | PACKAGECONFIG[static] = ",,qtdeclarative-native" | 20 | PACKAGECONFIG[static] = ",,qtdeclarative-native" |
22 | 21 | ||
23 | do_configure_prepend() { | ||
24 | # disable qtxmlpatterns test if it isn't enabled by PACKAGECONFIG | ||
25 | sed -e 's/^\(qtHaveModule(xmlpatterns)\)/OE_QTXMLPATTERNS_ENABLED:\1/' -i ${S}/src/imports/imports.pro | ||
26 | sed -e 's/^\(!qtHaveModule(xmlpatterns)\)/!OE_QTXMLPATTERNS_ENABLED|\1/' -i ${S}/tests/auto/quick/quick.pro | ||
27 | } | ||
28 | |||
29 | do_install_append_class-nativesdk() { | 22 | do_install_append_class-nativesdk() { |
30 | # qml files not needed in nativesdk | 23 | # qml files not needed in nativesdk |
31 | rm -rf ${D}${OE_QMAKE_PATH_QML} | 24 | rm -rf ${D}${OE_QMAKE_PATH_QML} |
32 | } | 25 | } |
33 | 26 | ||
34 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | ||
35 | |||
36 | SRCREV = "c401ae278b4bb91c70c6d7df974a241d7c68855b" | 27 | SRCREV = "c401ae278b4bb91c70c6d7df974a241d7c68855b" |
37 | 28 | ||
38 | BBCLASSEXTEND =+ "native nativesdk" | 29 | BBCLASSEXTEND =+ "native nativesdk" |