summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtdeclarative_git.bb
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative_git.bb')
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb16
1 files changed, 5 insertions, 11 deletions
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 2633be7e..a620a00a 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -16,14 +16,6 @@ LIC_FILES_CHKSUM = " \
16 16
17DEPENDS += "qtbase" 17DEPENDS += "qtbase"
18 18
19SRC_URI += " \
20 file://0001-qmltestexample-fix-link.patch \
21 file://0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch \
22 file://0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch \
23"
24
25EXTRA_OEMAKE += "QMAKE_SYNCQT=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/syncqt"
26
27PACKAGECONFIG ??= "qtxmlpatterns" 19PACKAGECONFIG ??= "qtxmlpatterns"
28PACKAGECONFIG[qtxmlpatterns] = ",,qtxmlpatterns" 20PACKAGECONFIG[qtxmlpatterns] = ",,qtxmlpatterns"
29 21
@@ -31,13 +23,15 @@ do_configure_prepend() {
31 # disable qtxmlpatterns test if it isn't enabled by PACKAGECONFIG 23 # disable qtxmlpatterns test if it isn't enabled by PACKAGECONFIG
32 sed -e 's/^\(qtHaveModule(xmlpatterns)\)/OE_QTXMLPATTERNS_ENABLED:\1/' -i ${S}/src/imports/imports.pro 24 sed -e 's/^\(qtHaveModule(xmlpatterns)\)/OE_QTXMLPATTERNS_ENABLED:\1/' -i ${S}/src/imports/imports.pro
33 sed -e 's/^\(!qtHaveModule(xmlpatterns)\)/!OE_QTXMLPATTERNS_ENABLED|\1/' -i ${S}/tests/auto/quick/quick.pro 25 sed -e 's/^\(!qtHaveModule(xmlpatterns)\)/!OE_QTXMLPATTERNS_ENABLED|\1/' -i ${S}/tests/auto/quick/quick.pro
26}
34 27
35 #set the path for syncqt properly 28do_install_append_class-nativesdk() {
36 echo "QT_TOOL.syncqt.binary = \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/syncqt\"" > ${B}/.qmake.cache 29 # qml files not needed in nativesdk
30 rm -rf ${D}${OE_QMAKE_PATH_QML}
37} 31}
38 32
39EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 33EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
40 34
41SRCREV = "d48b397cc79265e80c8437888f9ded0b0364e418" 35SRCREV = "fffb997e192a72b4dcd66edc2fbad5473dd359f3"
42 36
43BBCLASSEXTEND =+ "native nativesdk" 37BBCLASSEXTEND =+ "native nativesdk"