xf86-video-omapfb: pandora: handle cycle/forcer events better

[openembedded.git] / classes / qmake.bbclass

diff --git a/classes/qmake.bbclass b/classes/qmake.bbclass
index 0d3f45c..7dfe459 100644 (file)
--- a/classes/qmake.bbclass
+++ b/classes/qmake.bbclass
@@ -1,57 +1,15 @@
-inherit qmake-base
+inherit qmake_base
 
-qmake_do_configure() {
-       case ${QMAKESPEC} in
-       *linux-oe-g++|*linux-uclibc-oe-g++|*linux-gnueabi-oe-g++)
-               ;;
-       *-oe-g++)
-               die Unsupported target ${TARGET_OS} for oe-g++ qmake spec
-               ;;
-       *)
-               oenote Searching for qmake spec file
-               paths="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-${TARGET_ARCH}-g++"
-               paths="${QMAKE_MKSPEC_PATH}/${TARGET_OS}-g++ $paths"
+DEPENDS_prepend = "qmake-native "
 
-               if (echo "${TARGET_ARCH}"|grep -q 'i.86'); then
-                       paths="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-x86-g++ $paths"
-               fi
-               for i in $paths; do
-                       if test -e $i; then
-                               export QMAKESPEC=$i
-                               break
-                       fi
-               done
-               ;;
-       esac
+export QMAKESPEC
+export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic"
+export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc"
+export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake"
+export OE_QMAKE_CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}"
+export OE_QMAKE_LINK="${CCLD}"
+export OE_QMAKE_INCDIR_QT="${QTDIR}/include"
+export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib"
+export OE_QMAKE_LIBS_QT="qte"
+export OE_QMAKE_LIBS_X11=""
 
-       oenote "using qmake spec in ${QMAKESPEC}, using profiles '${QMAKE_PROFILES}'"
-
-       if [ -z "${QMAKE_PROFILES}" ]; then 
-               PROFILES="`ls *.pro`"
-       else
-               PROFILES="${QMAKE_PROFILES}"
-       fi
-
-       if [ -z "$PROFILES" ]; then
-               die "QMAKE_PROFILES not set and no profiles found in $PWD"
-        fi
-
-       if [ ! -z "${EXTRA_QMAKEVARS_POST}" ]; then
-               AFTER="-after"
-               QMAKE_VARSUBST_POST="${EXTRA_QMAKEVARS_POST}"
-               oenote "qmake postvar substitution: ${EXTRA_QMAKEVARS_POST}"
-       fi
-
-       if [ ! -z "${EXTRA_QMAKEVARS_PRE}" ]; then
-               QMAKE_VARSUBST_PRE="${EXTRA_QMAKEVARS_PRE}"
-               oenote "qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}"
-       fi
-
-#oenote "Calling 'qmake -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'"
-       unset QMAKESPEC || true
-       qmake -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling qmake on $PROFILES"
-}
-
-EXPORT_FUNCTIONS do_configure
-
-addtask configure after do_unpack do_patch before do_compile