diff options
| author |   Ihar Hrachyshka <ihar.hrachyshka@gmail.com> | 2009-06-03 05:37:13 +0000 |
|---|---|---|
| committer |   Denys Dmytriyenko <denis@denix.org> | 2009-06-09 23:21:28 -0400 |
| commit | 2211a434193811ae29af0783f5faa03f51f48123 (patch) | |
| tree | e13f4d7cb9e588b63335c69eece82e3f815097e7 /classes | |
| parent | 1106727f12c5d22f66e1f543616c90c9324ecb21 (diff) | |
| download | openembedded-2211a434193811ae29af0783f5faa03f51f48123.tar.gz | |
qt4: style refinements, more generalization
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Acked-by: Tom Rini <trini@embeddedalley.com>
Acked-by: Denys Dmytriyenko <denis@denix.org>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/qt4e.bbclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/classes/qt4e.bbclass b/classes/qt4e.bbclass index 445ecbaa6a..f72e06b6eb 100644 --- a/classes/qt4e.bbclass +++ b/classes/qt4e.bbclass @@ -2,15 +2,16 @@ DEPENDS_prepend = "${@["qt4-embedded ", ""][(bb.data.getVar('PN', d, 1) == 'qt4- inherit qmake2 QT_DIR_NAME = "qtopia" +QT_LIBINFIX = "E" # 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 QMAKESPEC = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++" +export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/${QT_DIR_NAME}" export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" export OE_QMAKE_LIBS_QT = "qt" export OE_QMAKE_LIBS_X11 = "" export OE_QMAKE_EXTRA_MODULES = "network" -EXTRA_QMAKEVARS_PRE += " QT_LIBINFIX=E " +EXTRA_QMAKEVARS_PRE += " QT_LIBINFIX=${QT_LIBINFIX} " # Qt4 uses atomic instructions not supported in thumb mode ARM_INSTRUCTION_SET = "arm" |