diff options
Diffstat (limited to 'meta/recipes-qt/qt4/qt4.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 47 |
1 files changed, 43 insertions, 4 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index ea868ff23c..1e76decff1 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc | |||
@@ -142,8 +142,8 @@ RRECOMMENDS_${QT_BASE_NAME}-qmlviewer += " \ | |||
142 | RRECOMMENDS_${QT_BASE_NAME}-doc += " \ | 142 | RRECOMMENDS_${QT_BASE_NAME}-doc += " \ |
143 | ${QT_BASE_NAME}-demos-doc" | 143 | ${QT_BASE_NAME}-demos-doc" |
144 | 144 | ||
145 | FILES_${QT_BASE_NAME}-tools = "${bindir}/qttracereplay ${bindir}/qdoc* ${bindir}/moc ${bindir}/uic* ${bindir}/rcc" | 145 | FILES_${QT_BASE_NAME}-tools = "${bindir}/qttracereplay ${bindir}/qdoc* ${bindir}/qmake ${bindir}/moc ${bindir}/uic* ${bindir}/rcc" |
146 | FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc* ${bindir}/.debug/uic* ${bindir}/.debug/moc ${bindir}/.debug/rcc" | 146 | FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc* ${bindir}/.debug/qmake ${bindir}/.debug/uic* ${bindir}/.debug/moc ${bindir}/.debug/rcc" |
147 | FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator" | 147 | FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator" |
148 | FILES_${QT_BASE_NAME}-assistant-dbg = "${bindir}/.debug/*assistant* ${bindir}/.debug/qcollectiongenerator ${bindir}/.debug/qhelpconverter ${bindir}/.debug/qhelpgenerator" | 148 | FILES_${QT_BASE_NAME}-assistant-dbg = "${bindir}/.debug/*assistant* ${bindir}/.debug/qcollectiongenerator ${bindir}/.debug/qhelpconverter ${bindir}/.debug/qhelpgenerator" |
149 | FILES_${QT_BASE_NAME}-common = "${bindir}/qtconfig" | 149 | FILES_${QT_BASE_NAME}-common = "${bindir}/qtconfig" |
@@ -172,7 +172,7 @@ FILES_${QT_BASE_NAME}-qmlviewer = "${bindir}/qmlviewer" | |||
172 | FILES_${QT_BASE_NAME}-qmlviewer-dbg = "${bindir}/.debug/qmlviewer" | 172 | FILES_${QT_BASE_NAME}-qmlviewer-dbg = "${bindir}/.debug/qmlviewer" |
173 | FILES_${QT_BASE_NAME}-makeqpf = "${bindir}/makeqpf" | 173 | FILES_${QT_BASE_NAME}-makeqpf = "${bindir}/makeqpf" |
174 | FILES_${QT_BASE_NAME}-makeqpf-dbg = "${bindir}/.debug/makeqpf" | 174 | FILES_${QT_BASE_NAME}-makeqpf-dbg = "${bindir}/.debug/makeqpf" |
175 | FILES_${QT_BASE_NAME}-mkspecs = "${datadir}/${QT_DIR_NAME}/mkspecs/*" | 175 | FILES_${QT_BASE_NAME}-mkspecs = "${datadir}/${QT_DIR_NAME}/mkspecs/* ${datadir}/${QT_DIR_NAME}/environment-setup" |
176 | FILES_${QT_BASE_NAME}-xmlpatterns = "${bindir}/xmlpatterns*" | 176 | FILES_${QT_BASE_NAME}-xmlpatterns = "${bindir}/xmlpatterns*" |
177 | FILES_${QT_BASE_NAME}-xmlpatterns-dbg = "${bindir}/.debug/xmlpatterns*" | 177 | FILES_${QT_BASE_NAME}-xmlpatterns-dbg = "${bindir}/.debug/xmlpatterns*" |
178 | FILES_${QT_BASE_NAME}-qml-plugins = "${libdir}/${QT_DIR_NAME}/imports/* ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/*" | 178 | FILES_${QT_BASE_NAME}-qml-plugins = "${libdir}/${QT_DIR_NAME}/imports/* ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/*" |
@@ -236,6 +236,24 @@ do_configure() { | |||
236 | -I${STAGING_INCDIR}/freetype2 | 236 | -I${STAGING_INCDIR}/freetype2 |
237 | } | 237 | } |
238 | 238 | ||
239 | do_compile() { | ||
240 | # Fixup missing wsegl header in some SGX SDKs | ||
241 | if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then | ||
242 | cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/ | ||
243 | fi | ||
244 | |||
245 | unset CFLAGS CXXFLAGS | ||
246 | |||
247 | oe_runmake ${EXTRA_ENV} | ||
248 | |||
249 | # Build target qmake | ||
250 | export QMAKESPEC="${S}/mkspecs/${TARGET_OS}-oe-g++" | ||
251 | cd ${S}/qmake | ||
252 | ${OE_QMAKE_QMAKE} | ||
253 | oe_runmake CC="${CC}" CXX="${CXX}" | ||
254 | cd ${S} | ||
255 | } | ||
256 | |||
239 | python populate_packages_prepend() { | 257 | python populate_packages_prepend() { |
240 | translation_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d) | 258 | translation_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d) |
241 | translation_name = bb.data.expand('${QT_BASE_NAME}-translation-%s', d) | 259 | translation_name = bb.data.expand('${QT_BASE_NAME}-translation-%s', d) |
@@ -295,8 +313,9 @@ python populate_packages_prepend() { | |||
295 | do_install() { | 313 | do_install() { |
296 | oe_runmake install INSTALL_ROOT=${D} | 314 | oe_runmake install INSTALL_ROOT=${D} |
297 | 315 | ||
298 | # These are host binaries, we should only use them in staging | 316 | # Install a proper target version of qmake |
299 | rm ${D}/${bindir}/qmake | 317 | rm ${D}/${bindir}/qmake |
318 | install -m 0755 bin/qmake2 ${D}${bindir}/qmake | ||
300 | 319 | ||
301 | # fix pkgconfig, libtool and prl files | 320 | # fix pkgconfig, libtool and prl files |
302 | sed -i -e 's#-L${S}/lib/\?##g' \ | 321 | sed -i -e 's#-L${S}/lib/\?##g' \ |
@@ -333,4 +352,24 @@ do_install() { | |||
333 | if [ -n "${QT_LIBINFIX}" ] ; then | 352 | if [ -n "${QT_LIBINFIX}" ] ; then |
334 | [ -f ${D}${bindir}/qtdemo ] && mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX} | 353 | [ -f ${D}${bindir}/qtdemo ] && mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX} |
335 | fi | 354 | fi |
355 | |||
356 | script="${D}/${datadir}/${QT_DIR_NAME}/environment-setup" | ||
357 | touch $script | ||
358 | echo 'export QT_DIR_NAME=${QT_DIR_NAME}' >> $script | ||
359 | echo 'export QT_LIBINFIX=${QT_LIBINFIX}' >> $script | ||
360 | echo 'export OE_QMAKE_AR=ar' >> $script | ||
361 | echo 'export OE_QMAKE_CC=gcc' >> $script | ||
362 | echo 'export OE_QMAKE_CXX=g++' >> $script | ||
363 | echo 'export OE_QMAKE_LINK=g++' >> $script | ||
364 | echo 'export OE_QMAKE_LIBDIR_QT=${libdir}' >> $script | ||
365 | echo 'export OE_QMAKE_INCDIR_QT=${includedir}/${QT_DIR_NAME}' >> $script | ||
366 | echo 'export OE_QMAKE_MOC=${bindir}/moc' >> $script | ||
367 | echo 'export OE_QMAKE_UIC=${bindir}/uic' >> $script | ||
368 | echo 'export OE_QMAKE_UIC3=${bindir}/uic3' >> $script | ||
369 | echo 'export OE_QMAKE_RCC=${bindir}/rcc' >> $script | ||
370 | echo 'export OE_QMAKE_QDBUSCPP2XML=${bindir}/qdbuscpp2xml' >> $script | ||
371 | echo 'export OE_QMAKE_QDBUSXML2CPP=${bindir}/qdbusxml2cpp' >> $script | ||
372 | echo 'export OE_QMAKE_QT_CONFIG=${datadir}/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script | ||
373 | echo 'export QMAKESPEC=${datadir}/${QT_DIR_NAME}/mkspecs/linux-g++' >> $script | ||
374 | chmod 0755 $script | ||
336 | } | 375 | } |