From 2d65566d32c3b889ad0d0e523f2e6c7f7ef41364 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 24 Dec 2007 13:42:04 +0000 Subject: classes/qmake2,qtopia4core: Change the Qt include and library dir to match the new location/names --- classes/qmake2.bbclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'classes/qmake2.bbclass') 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" -- cgit v1.2.3 From 79e6dae1cb3b5367da8d375fa1cf2f8480b64e6e Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 24 Dec 2007 23:55:27 +0000 Subject: classes/qmake2.bbclass: Remove the usage of the QTDIR from this line as well (sadly no equivalent to git-commit --amend is available) --- classes/qmake2.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/qmake2.bbclass') diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass index 63d6faf782..cf3419f824 100644 --- a/classes/qmake2.bbclass +++ b/classes/qmake2.bbclass @@ -5,7 +5,7 @@ inherit qmake_base DEPENDS_prepend = "qmake2-native uicmoc4-native " -export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++" +export QMAKESPEC = "${CROSS_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" -- cgit v1.2.3