diff options
Diffstat (limited to 'external/meta-qt5/recipes-qt/qt5/qtdeclarative_git.bb')
| -rw-r--r-- | external/meta-qt5/recipes-qt/qt5/qtdeclarative_git.bb | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/external/meta-qt5/recipes-qt/qt5/qtdeclarative_git.bb b/external/meta-qt5/recipes-qt/qt5/qtdeclarative_git.bb index 4cfde304..b588df0e 100644 --- a/external/meta-qt5/recipes-qt/qt5/qtdeclarative_git.bb +++ b/external/meta-qt5/recipes-qt/qt5/qtdeclarative_git.bb @@ -12,31 +12,25 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " -# Patches from https://github.com/meta-qt5/qtdeclarative/commits/b5.11 -# 5.11.meta-qt5.4 -SRC_URI += "file://0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch" +# Patches from https://github.com/meta-qt5/qtdeclarative/commits/b5.14 +# 5.14.meta-qt5.1 +SRC_URI += " \ + file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch \ + file://0002-Use-python3-explicitly.patch \ +" 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 = "e3c0bb7811407bad1f65ea55639a4b1d1d39be15" +SRCREV = "23a000f9a14889753a63cd73de2c61e49bb7e0d8" BBCLASSEXTEND =+ "native nativesdk" |