diff options
Diffstat (limited to 'meta/recipes-qt/qt4/qt4.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 468a46ff74..23fda336b2 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc | |||
@@ -4,8 +4,6 @@ DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gst | |||
4 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" | 4 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" |
5 | 5 | ||
6 | require qt4_arch.inc | 6 | require qt4_arch.inc |
7 | QT_ARCH := "${@qt_arch(d)}" | ||
8 | QT_ENDIAN = "${@qt_endian(d)}" | ||
9 | 7 | ||
10 | QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm" | 8 | QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm" |
11 | QT_DISTRO_FLAGS_linuxstdbase = "-sm" | 9 | QT_DISTRO_FLAGS_linuxstdbase = "-sm" |
@@ -200,6 +198,9 @@ do_configure() { | |||
200 | unset QMAKESPEC | 198 | unset QMAKESPEC |
201 | unset QTDIR | 199 | unset QTDIR |
202 | 200 | ||
201 | set_arch | ||
202 | set_endian | ||
203 | |||
203 | if [ ! -e bin/qmake ]; then | 204 | if [ ! -e bin/qmake ]; then |
204 | ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake | 205 | ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake |
205 | fi | 206 | fi |