[oe-commits] org.oe.dev palmtop.bbclass: Finally, set qte library variant (MT vs non-MT) at the proper place.

[pfalcon commit]

palmtop.bbclass: Finally, set qte library variant (MT vs non-MT) at the proper place.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 618bda0557cc4588d6e1f66a2fee4041287cae15
ViewMTN: http://monotone.openembedded.org/revision.psp?id=618bda0557cc4588d6e1f66a2fee4041287cae15
Files:
1
classes/palmtop.bbclass
classes/qmake-base.bbclass
Diffs:

#
# mt diff -r161e1a738dc05762f428e26351dfe3cf5cd65ec4 -r618bda0557cc4588d6e1f66a2fee4041287cae15
#
# 
# 
# patch "classes/palmtop.bbclass"
#  from [8f2da59d99d7b1d032014727af453436c641ed29]
#    to [47dee0d1bcbc560241a59d1d1689a90ca8e37b3f]
# 
# patch "classes/qmake-base.bbclass"
#  from [21899cea6a7a8f08dec40c2a294e92ea41fb9c6b]
#    to [48e5a70a69927658c2baca79ac02bde07866b4fc]
# 
============================================================
--- classes/palmtop.bbclass	8f2da59d99d7b1d032014727af453436c641ed29
+++ classes/palmtop.bbclass	47dee0d1bcbc560241a59d1d1689a90ca8e37b3f
@@ -16,6 +16,7 @@ DEPENDS_prepend = "${@["virtual/libqpe1 
 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} "
============================================================
--- classes/qmake-base.bbclass	21899cea6a7a8f08dec40c2a294e92ea41fb9c6b
+++ classes/qmake-base.bbclass	48e5a70a69927658c2baca79ac02bde07866b4fc
@@ -23,7 +23,7 @@ export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib"
 # 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 () {