diff options
Diffstat (limited to 'classes/qt4x11.bbclass')
| -rw-r--r-- | classes/qt4x11.bbclass | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass index d4ca0073df..2d56b7e95b 100644 --- a/classes/qt4x11.bbclass +++ b/classes/qt4x11.bbclass @@ -1,11 +1,6 @@ -# -# override variables set by qmake-base to compile Qt/X11 apps -# -export QTDIR="${STAGING_DIR}/${HOST_SYS}/qt4" -export OE_QMAKE_UIC="${STAGING_BINDIR}/uic4" -export OE_QMAKE_MOC="${STAGING_BINDIR}/moc4" -export OE_QMAKE_CXXFLAGS="${CXXFLAGS}" -export OE_QMAKE_INCDIR_QT="${QTDIR}/include" -export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" -export OE_QMAKE_LIBS_QT="qt" -export OE_QMAKE_LIBS_X11="-lXext -lX11 -lm" +DEPENDS_prepend = "${@["qt4-x11-free ", ""][(bb.data.getVar('PN', d, 1)[:12] == 'qt4-x11-free')]}" + +inherit qmake2 + +# Qt4 uses atomic instructions not supported in thumb mode +ARM_INSTRUCTION_SET = "arm" |