diff options
| -rw-r--r-- | classes/qt4x11.bbclass | 4 | ||||
| -rw-r--r-- | packages/qmake/qmake2-native_2.00a.bb | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass index afa840f5db..04aff565be 100644 --- a/classes/qt4x11.bbclass +++ b/classes/qt4x11.bbclass @@ -1,7 +1,9 @@ +DEPENDS_prepend = "qmake2-native " # -# override variables set by qmake-base to compile Qt/X11 apps +# override variables set by qmake-base to compile Qt4/X11 apps # export QTDIR="${STAGING_DIR}/${HOST_SYS}/qt4" +export QMAKESPEC="${QTDIR}/mkspecs/${TARGET_OS}-oe-g++" export OE_QMAKE_UIC="${STAGING_BINDIR}/uic4" export OE_QMAKE_MOC="${STAGING_BINDIR}/moc4" export OE_QMAKE_RCC="${STAGING_BINDIR}/rcc4" diff --git a/packages/qmake/qmake2-native_2.00a.bb b/packages/qmake/qmake2-native_2.00a.bb index 5e95ba38df..744588ed27 100644 --- a/packages/qmake/qmake2-native_2.00a.bb +++ b/packages/qmake/qmake2-native_2.00a.bb @@ -41,8 +41,8 @@ do_compile() { do_stage() { install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2 - install -d ${QMAKE_MKSPEC_PATH} - cp -dfR mkspecs/* ${QMAKE_MKSPEC_PATH} + install -d ${STAGING_DIR}/${CROSS_SYS}/qt4/ + cp -dfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/ } do_install() { |