diff options
Diffstat (limited to 'meta/recipes-qt/qt4/qt-4.7.4.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.4.inc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.7.4.inc b/meta/recipes-qt/qt4/qt-4.7.4.inc index 5c06bbe0cb..bc33b6b1b8 100644 --- a/meta/recipes-qt/qt4/qt-4.7.4.inc +++ b/meta/recipes-qt/qt4/qt-4.7.4.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 | file://fix-qtbug-20925.patch \ | 19 | file://fix-qtbug-20925.patch \ |
@@ -27,7 +28,9 @@ FILES_${QT_BASE_NAME}-tools += "${bindir}/qml" | |||
27 | 28 | ||
28 | do_configure_prepend() { | 29 | do_configure_prepend() { |
29 | for pro in $(find ${S} -name "*.pro") ; do | 30 | for pro in $(find ${S} -name "*.pro") ; do |
30 | sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro | 31 | sed -i \ |
32 | -e 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' \ | ||
33 | -e 's:qtPrepareTool(LRELEASE, lrelease):LRELEASE = ${OE_QMAKE_LRELEASE}:g' $pro | ||
31 | done | 34 | done |
32 | 35 | ||
33 | sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf | 36 | sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf |
@@ -39,10 +42,6 @@ do_configure_prepend() { | |||
39 | ${S}/configure | 42 | ${S}/configure |
40 | } | 43 | } |
41 | 44 | ||
42 | do_configure_append() { | ||
43 | sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile | ||
44 | } | ||
45 | |||
46 | QT_GLFLAGS ?= "" | 45 | QT_GLFLAGS ?= "" |
47 | QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}" | 46 | QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}" |
48 | 47 | ||