diff options
| author |   Jeremy Lainé <jeremy.laine@m4x.org> | 2009-03-24 20:11:19 +0100 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2009-03-24 20:11:19 +0100 |
| commit | 6022c967ea47f26119de83af370cb066540bd0fc (patch) | |
| tree | 560a6d885e58dc0126ccf0bbdc36e49e5d8af0a6 | |
| parent | d0b2a8dd1be8044827add0a5cb75aefcb6f93be3 (diff) | |
| download | openembedded-6022c967ea47f26119de83af370cb066540bd0fc.tar.gz | |
{qt4e,qmake2}.bbclass: fix definition of QMAKESPEC
| -rw-r--r-- | classes/qmake2.bbclass | 2 | ||||
| -rw-r--r-- | classes/qt4e.bbclass | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass index 8a443d062a..9ced896fe8 100644 --- a/classes/qmake2.bbclass +++ b/classes/qmake2.bbclass @@ -5,7 +5,7 @@ inherit qmake_base DEPENDS_prepend = "qmake2-native uicmoc4-native " -export QMAKESPEC = "${CROSS_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++" +export QMAKESPEC = "${STAGING_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++" export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4" export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34" export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4" diff --git a/classes/qt4e.bbclass b/classes/qt4e.bbclass index 8beef29df4..e3d6fad7a0 100644 --- a/classes/qt4e.bbclass +++ b/classes/qt4e.bbclass @@ -4,6 +4,7 @@ inherit qmake2 QT_DIR_NAME = "qtopia" # override variables set by qmake-base to compile Qt/Embedded apps # +export QMAKESPEC = "${STAGING_DATADIR}/qtopia/mkspecs/${TARGET_OS}-oe-g++" export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopia" export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" export OE_QMAKE_LIBS_QT = "qt" |