From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Wed, 6 Jun 2007 21:41:23 +0000 (+0000)
Subject: palmtop.bbclass: Finally, set qte library variant (MT vs non-MT) at the proper place.
X-Git-Tag: Release-2010-05/1~8868^2~400^2~72^2~1^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77df7f179c2f4ea1c86f350173c486ed14d4040b;p=openembedded.git

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

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 () {