From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 23 Apr 2006 16:32:21 +0000 (+0000)
Subject: palmtop.bbclass: say CONFIG-=thread if we don't build against a multithreaded qt
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~8^2~28
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b95c610452bf38d6c9fb6a3a66f2ecf1050a99c;p=openembedded.git

palmtop.bbclass: say CONFIG-=thread if we don't build against a multithreaded qt
---

diff --git a/classes/palmtop.bbclass b/classes/palmtop.bbclass
index 083f5148a1..7c65271b91 100644
--- a/classes/palmtop.bbclass
+++ b/classes/palmtop.bbclass
@@ -5,12 +5,13 @@
 #   * use threads, if requested via PALMTOP_USE_MULTITHREADED_QT = "yes"
 # inherit this class to build programs against libqpe
 # inherit opie if you want to build programs against libopie2
+# don't override EXTRA_QMAKEVARS_POST, if you use inherit this class
 
 inherit qmake
 
-EXTRA_QMAKEVARS_POST += "DEFINES+=QWS LIBS+=-lqpe CONFIG+=qt LIBS-=-lstdc++ LIBS+=-lsupc++"
-EXTRA_QMAKEVARS_POST += '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "CONFIG+=thread", " ",d)}'
-
+EXTRA_QMAKEVARS_POST += "DEFINES+=QWS CONFIG+=qt LIBS-=-lstdc++ LIBS+=-lsupc++"
+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')]}"
 
 FILES_${PN} = "${palmtopdir}"