diff options
Diffstat (limited to 'meta/recipes-qt/qt4/qt-4.7.3.inc')
| -rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.3.inc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.7.3.inc b/meta/recipes-qt/qt4/qt-4.7.3.inc index a5b8b05bff..16c7b08908 100644 --- a/meta/recipes-qt/qt4/qt-4.7.3.inc +++ b/meta/recipes-qt/qt4/qt-4.7.3.inc | |||
| @@ -13,6 +13,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}. | |||
| 13 | file://0009-support-2bpp.patch \ | 13 | file://0009-support-2bpp.patch \ |
| 14 | file://0001-Added-Openembedded-crossarch-option.patch \ | 14 | file://0001-Added-Openembedded-crossarch-option.patch \ |
| 15 | file://blacklist-diginotar-certs.diff \ | 15 | file://blacklist-diginotar-certs.diff \ |
| 16 | file://fix-translations.patch \ | ||
| 16 | file://g++.conf \ | 17 | file://g++.conf \ |
| 17 | file://linux.conf \ | 18 | file://linux.conf \ |
| 18 | " | 19 | " |
| @@ -26,7 +27,9 @@ FILES_${QT_BASE_NAME}-tools += "${bindir}/qml" | |||
| 26 | 27 | ||
| 27 | do_configure_prepend() { | 28 | do_configure_prepend() { |
| 28 | for pro in $(find ${S} -name "*.pro") ; do | 29 | for pro in $(find ${S} -name "*.pro") ; do |
| 29 | sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro | 30 | sed -i \ |
| 31 | -e 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' \ | ||
| 32 | -e 's:qtPrepareTool(LRELEASE, lrelease):LRELEASE = ${OE_QMAKE_LRELEASE}:g' $pro | ||
| 30 | done | 33 | done |
| 31 | 34 | ||
| 32 | sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf | 35 | sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf |
| @@ -38,10 +41,6 @@ do_configure_prepend() { | |||
| 38 | ${S}/configure | 41 | ${S}/configure |
| 39 | } | 42 | } |
| 40 | 43 | ||
| 41 | do_configure_append() { | ||
| 42 | sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile | ||
| 43 | } | ||
| 44 | |||
| 45 | QT_GLFLAGS ?= "" | 44 | QT_GLFLAGS ?= "" |
| 46 | QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}" | 45 | QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}" |
| 47 | 46 | ||
