diff options
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtdeclarative_git.bb | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 93330165..421c4820 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -4,9 +4,9 @@ require qt5-git.inc | |||
4 | # There are no LGPLv3-only licensed files in this component. | 4 | # There are no LGPLv3-only licensed files in this component. |
5 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)" | 5 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)" |
6 | LIC_FILES_CHKSUM = " \ | 6 | LIC_FILES_CHKSUM = " \ |
7 | file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | 7 | file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ |
8 | file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \ | 8 | file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ |
9 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | 9 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ |
10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
11 | " | 11 | " |
12 | 12 | ||
@@ -16,6 +16,8 @@ SRC_URI += " \ | |||
16 | file://0001-qmltestexample-fix-link.patch \ | 16 | file://0001-qmltestexample-fix-link.patch \ |
17 | " | 17 | " |
18 | 18 | ||
19 | EXTRA_OEMAKE += "QMAKE_SYNCQT=${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/syncqt" | ||
20 | |||
19 | PACKAGECONFIG ??= "qtxmlpatterns" | 21 | PACKAGECONFIG ??= "qtxmlpatterns" |
20 | PACKAGECONFIG[qtxmlpatterns] = ",,qtxmlpatterns" | 22 | PACKAGECONFIG[qtxmlpatterns] = ",,qtxmlpatterns" |
21 | 23 | ||
@@ -23,8 +25,11 @@ do_configure_prepend() { | |||
23 | # disable qtxmlpatterns test if it isn't enabled by PACKAGECONFIG | 25 | # disable qtxmlpatterns test if it isn't enabled by PACKAGECONFIG |
24 | 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}/src/imports/imports.pro |
25 | sed -e 's/^\(!qtHaveModule(xmlpatterns)\)/!OE_QTXMLPATTERNS_ENABLED|\1/' -i ${S}/tests/auto/quick/quick.pro | 27 | sed -e 's/^\(!qtHaveModule(xmlpatterns)\)/!OE_QTXMLPATTERNS_ENABLED|\1/' -i ${S}/tests/auto/quick/quick.pro |
28 | |||
29 | #set the path for syncqt properly | ||
30 | echo "QT_TOOL.syncqt.binary = \"${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/syncqt\"" > ${B}/.qmake.cache | ||
26 | } | 31 | } |
27 | 32 | ||
28 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | 33 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |
29 | 34 | ||
30 | SRCREV = "2fdb6eba0a58b629db32f9eefec2f26df08d3d2e" | 35 | SRCREV = "cc0df64bb0e1dea2fe37950816095802f527a241" |