From: Jeremy Lainé Date: Fri, 24 Apr 2009 17:50:02 +0000 (+0200) Subject: qmake2.bbclass: add OE_QMAKE_QDBUSXML2CPP and OE_QMAKE_QDBUSCPP2XML X-Git-Tag: Release-2010-05/1~3685 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fce876f33d514633db77bfeba1a5e1b39f40c550;p=openembedded.git qmake2.bbclass: add OE_QMAKE_QDBUSXML2CPP and OE_QMAKE_QDBUSCPP2XML From: Otavio Salvador Signed-off-by: Otavio Salvador Acked-by: Jeremy Lainé --- diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass index f0a7931698..26e813a036 100644 --- a/classes/qmake2.bbclass +++ b/classes/qmake2.bbclass @@ -10,6 +10,8 @@ export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4" export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34" export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4" export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4" +export OE_QMAKE_QDBUSCPP2XML = "${STAGING_BINDIR_NATIVE}/qdbuscpp2xml4" +export OE_QMAKE_QDBUSXML2CPP = "${STAGING_BINDIR_NATIVE}/qdbusxml2cpp4" export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2" export OE_QMAKE_LINK = "${CXX}" export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" diff --git a/recipes/qt4/files/linux.conf b/recipes/qt4/files/linux.conf index 3471c6f9f6..90b8d65aba 100644 --- a/recipes/qt4/files/linux.conf +++ b/recipes/qt4/files/linux.conf @@ -28,6 +28,8 @@ QMAKE_MOC = $(OE_QMAKE_MOC) QMAKE_UIC = $(OE_QMAKE_UIC) QMAKE_UIC3 = $(OE_QMAKE_UIC3) QMAKE_RCC = $(OE_QMAKE_RCC) +QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML) +QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP) QMAKE_AR = $(OE_QMAKE_AR) cqs QMAKE_OBJCOPY = objcopy