diff options
| author | Marcin Juszkiewicz <hrw@koansoftware.com> | 2009-03-26 11:10:03 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@koansoftware.com> | 2009-03-26 11:10:03 +0100 |
| commit | a7be854977d7ad7c8460fee76739db8154e83049 (patch) | |
| tree | 3696192bc8abcae8ce4e0121df2dd4e5246541df /classes/qmake2.bbclass | |
| parent | e2718269c5f56774705478545316a879f0be82c4 (diff) | |
| parent | 1b045e71ce7c3b7ed6c68ae1d60e974edbe38efc (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'classes/qmake2.bbclass')
| -rw-r--r-- | classes/qmake2.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass index 8a443d062a..5ea31a976d 100644 --- a/classes/qmake2.bbclass +++ b/classes/qmake2.bbclass @@ -3,9 +3,9 @@ # inherit qmake_base -DEPENDS_prepend = "qmake2-native uicmoc4-native " +DEPENDS_prepend = "qt4-tools-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" |