diff options
| author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-06-07 00:32:35 +0000 |
|---|---|---|
| committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-06-07 00:32:35 +0000 |
| commit | 1571a7edea7968de3469e0763c27f3231a6fe553 (patch) | |
| tree | 06ca728b49aa0723737510eeab1cc52e065ace62 /classes | |
| parent | 8e71775586c38ccb0d393fb6b06fcb573c072ce9 (diff) | |
| parent | 06009a026a3aed63e7bcf08daa88f6b0117318dd (diff) | |
merge of '3522489c0311d58fd9ccb9e295ecac8a0a18fc21'
and '7ce845adf550b64d9d2250d29acf1667cf40a689'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/palmtop.bbclass | 1 | ||||
| -rw-r--r-- | classes/qmake-base.bbclass | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/classes/palmtop.bbclass b/classes/palmtop.bbclass index 39b9bd2b60..e99b31aaa3 100644 --- a/classes/palmtop.bbclass +++ b/classes/palmtop.bbclass @@ -16,6 +16,7 @@ EXTRA_QMAKEVARS_POST += "DEFINES+=QWS CONFIG+=qt ${CPP_SUPPORT_LIB}" EXTRA_QMAKEVARS_POST += '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "CONFIG+=thread", "CONFIG-=thread",d)}' EXTRA_QMAKEVARS_POST += "${@["LIBS+=-lqpe ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}" DEPENDS_prepend = "${@["virtual/libqpe1 uicmoc-native ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}" +QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}' PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale" FILES_${PN} = " ${palmtopdir} " diff --git a/classes/qmake-base.bbclass b/classes/qmake-base.bbclass index 09694e97b8..5ca3ee2904 100644 --- a/classes/qmake-base.bbclass +++ b/classes/qmake-base.bbclass @@ -23,7 +23,7 @@ export OE_QMAKE_RPATH="-Wl,-rpath-link," # default to qte2 via bb.conf, inherit qt3x11 to configure for qt3x11 export OE_QMAKE_INCDIR_QT="${QTDIR}/include" export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" -export OE_QMAKE_LIBS_QT="qte" +export OE_QMAKE_LIBS_QT="${QT_LIBRARY}" export OE_QMAKE_LIBS_X11="" oe_qmake_mkspecs () { |