diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2015-11-26 09:06:37 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-12-15 16:46:42 +0100 |
commit | 593c47aa37837a725b392c33011f3962da7c1539 (patch) | |
tree | 21fabc4349cacbab617d1b27a59b67e16e0163ab /recipes-qt | |
parent | 76c57af769d7627db760dddceeb673d75a05cebf (diff) | |
download | meta-qt5-593c47aa37837a725b392c33011f3962da7c1539.tar.gz |
qt5-creator: building qmldesigner with gcc5 works so enable it
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt')
-rw-r--r-- | recipes-qt/qt5/qt5-creator_3.5.1.bb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qt5-creator_3.5.1.bb b/recipes-qt/qt5/qt5-creator_3.5.1.bb index 4bb0998b..2d8cee9d 100644 --- a/recipes-qt/qt5/qt5-creator_3.5.1.bb +++ b/recipes-qt/qt5/qt5-creator_3.5.1.bb | |||
@@ -30,12 +30,6 @@ S = "${WORKDIR}/qt-creator-opensource-src-${PV}" | |||
30 | 30 | ||
31 | EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}${QT_DIR_NAME}" | 31 | EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}${QT_DIR_NAME}" |
32 | 32 | ||
33 | do_configure_prepend() { | ||
34 | # causes gcc infinite loop with 4.9.x for arm targets similar to | ||
35 | # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61033 | ||
36 | export DO_NOT_BUILD_QMLDESIGNER=1 | ||
37 | } | ||
38 | |||
39 | do_configure_append() { | 33 | do_configure_append() { |
40 | # Find native tools | 34 | # Find native tools |
41 | sed -i 's:${STAGING_BINDIR}.*/lrelease:${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/lrelease:g' ${B}/share/qtcreator/translations/Makefile | 35 | sed -i 's:${STAGING_BINDIR}.*/lrelease:${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/lrelease:g' ${B}/share/qtcreator/translations/Makefile |
@@ -67,6 +61,7 @@ FILES_${PN} += " \ | |||
67 | FILES_${PN}-dbg += " \ | 61 | FILES_${PN}-dbg += " \ |
68 | ${libdir}${QT_DIR_NAME}/qtcreator/.debug \ | 62 | ${libdir}${QT_DIR_NAME}/qtcreator/.debug \ |
69 | ${libdir}${QT_DIR_NAME}/qtcreator/plugins/.debug \ | 63 | ${libdir}${QT_DIR_NAME}/qtcreator/plugins/.debug \ |
64 | ${libdir}${QT_DIR_NAME}/qtcreator/plugins/qmldesigner/.debug \ | ||
70 | ${libdir}${QT_DIR_NAME}/qtcreator/plugins/qbs/plugins/.debug \ | 65 | ${libdir}${QT_DIR_NAME}/qtcreator/plugins/qbs/plugins/.debug \ |
71 | " | 66 | " |
72 | 67 | ||