diff options
| -rw-r--r-- | classes/qmake2.bbclass | 5 | ||||
| -rw-r--r-- | classes/qtopia4core.bbclass | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass index d0f59d2cd4..63d6faf782 100644 --- a/classes/qmake2.bbclass +++ b/classes/qmake2.bbclass @@ -5,7 +5,6 @@ inherit qmake_base DEPENDS_prepend = "qmake2-native uicmoc4-native " -export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4" export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++" export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4" export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34" @@ -14,7 +13,7 @@ export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4" export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2" export OE_QMAKE_LINK = "${CXX}" export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" -export OE_QMAKE_INCDIR_QT = "${QTDIR}/include" -export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib" +export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt4" +export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qt4" export OE_QMAKE_LIBS_QT = "qt" export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" diff --git a/classes/qtopia4core.bbclass b/classes/qtopia4core.bbclass index 86bc7afc2f..d14e68bb64 100644 --- a/classes/qtopia4core.bbclass +++ b/classes/qtopia4core.bbclass @@ -4,8 +4,8 @@ inherit qmake2 # # override variables set by qmake-base to compile QtopiaCore apps # -export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopiacore4" -export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopiacore4/" +export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopiacore" +export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopiacore" export OE_QMAKE_LIBS_QT = "qt" export OE_QMAKE_LIBS_X11 = "" EXTRA_QMAKEVARS_POST += "LIBS+=-lQtNetwork " |