diff options
author | Rene Wagner <rw@handhelds.org> | 2005-07-29 21:17:08 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-29 21:17:08 +0000 |
commit | 96311266fb4ee5b87fec4b64f65d42431dfe5b42 (patch) | |
tree | 977f974554e19f6b3e38fce6faf1617cd2b4fc2d /classes | |
parent | 39773aaf1be97eeb4bcdbd1fc9610bccb7a420a9 (diff) | |
parent | 1c58a321e42af440ce535b75a0a59cb80061a263 (diff) |
merge of 22b6c89379f44959daad0672b60b3b2775b9364a
and a9d332834a83bff1778ad969b7e1514a83a3c137
Diffstat (limited to 'classes')
-rw-r--r-- | classes/qt3x11.bbclass | 2 | ||||
-rw-r--r-- | classes/tinderclient.bbclass | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/classes/qt3x11.bbclass b/classes/qt3x11.bbclass index 2a2f3d5bbd..09b9cbac96 100644 --- a/classes/qt3x11.bbclass +++ b/classes/qt3x11.bbclass @@ -4,7 +4,7 @@ export QTDIR="${STAGING_DIR}/${HOST_SYS}/qt3" export OE_QMAKE_UIC="${STAGING_BINDIR}/uic3" export OE_QMAKE_MOC="${STAGING_BINDIR}/moc3" -export OE_QMAKE_CXXFLAGS="${CXXFLAGS}" +export OE_QMAKE_CXXFLAGS="${CXXFLAGS} -DQT_NO_XIM" export OE_QMAKE_INCDIR_QT="${QTDIR}/include" export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" export OE_QMAKE_LIBS_QT="qt" diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass index 0c0c470bb8..5de9b8755a 100644 --- a/classes/tinderclient.bbclass +++ b/classes/tinderclient.bbclass @@ -51,7 +51,7 @@ def tinder_do_tinder_report(event): tinderclient.log """ from bb.event import getName - from bb import data, make, mkdirhier + from bb import data, mkdirhier import os, glob # variables |