diff options
Diffstat (limited to 'meta/recipes-qt/qt4/qt4.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index df70e09918..9b42f69861 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc | |||
@@ -192,6 +192,10 @@ FILES_${QT_BASE_NAME}-xmlpatterns-dbg = "${bindir}/.debug/xmlpatterns*" | |||
192 | FILES_${QT_BASE_NAME}-qml-plugins = "${libdir}/${QT_DIR_NAME}/imports/* ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/*" | 192 | FILES_${QT_BASE_NAME}-qml-plugins = "${libdir}/${QT_DIR_NAME}/imports/* ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/*" |
193 | FILES_${QT_BASE_NAME}-qml-plugins-dbg = "${libdir}/${QT_DIR_NAME}/imports/*/*/*/.debug/* ${libdir}/${QT_DIR_NAME}/imports/*/.debug ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/.debug" | 193 | FILES_${QT_BASE_NAME}-qml-plugins-dbg = "${libdir}/${QT_DIR_NAME}/imports/*/*/*/.debug/* ${libdir}/${QT_DIR_NAME}/imports/*/.debug ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/.debug" |
194 | 194 | ||
195 | # License options, to be set by the recipe if different values are needed | ||
196 | QT_LICENSE_FILE ?= "" | ||
197 | QT_LICENSE_FLAGS ?= "-opensource" | ||
198 | |||
195 | do_configure() { | 199 | do_configure() { |
196 | unset QMAKESPEC | 200 | unset QMAKESPEC |
197 | unset QTDIR | 201 | unset QTDIR |
@@ -231,7 +235,7 @@ do_configure() { | |||
231 | 235 | ||
232 | ${EXTRA_QMAKE_MUNGE}|| true | 236 | ${EXTRA_QMAKE_MUNGE}|| true |
233 | 237 | ||
234 | (echo o; echo yes) | ./configure -v \ | 238 | echo yes | QT_LICENSE_FILE="${QT_LICENSE_FILE}" ./configure -v \ |
235 | -prefix ${prefix}/ \ | 239 | -prefix ${prefix}/ \ |
236 | -bindir ${bindir} \ | 240 | -bindir ${bindir} \ |
237 | -libdir ${libdir} \ | 241 | -libdir ${libdir} \ |
@@ -248,6 +252,7 @@ do_configure() { | |||
248 | -xplatform ${TARGET_OS}-oe-g++ \ | 252 | -xplatform ${TARGET_OS}-oe-g++ \ |
249 | ${QT_ENDIAN} \ | 253 | ${QT_ENDIAN} \ |
250 | -crossarch ${QT_ARCH} \ | 254 | -crossarch ${QT_ARCH} \ |
255 | ${QT_LICENSE_FLAGS} \ | ||
251 | ${QT_CONFIG_FLAGS} -no-fast \ | 256 | ${QT_CONFIG_FLAGS} -no-fast \ |
252 | -L${STAGING_LIBDIR} -I${STAGING_INCDIR} \ | 257 | -L${STAGING_LIBDIR} -I${STAGING_INCDIR} \ |
253 | -I${STAGING_INCDIR}/freetype2 | 258 | -I${STAGING_INCDIR}/freetype2 |