aboutsummaryrefslogtreecommitdiffstats
path: root/classes/palmtop.bbclass
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-04-23 16:32:21 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-04-23 16:32:21 +0000
commit2b95c610452bf38d6c9fb6a3a66f2ecf1050a99c (patch)
treeb3fcf53fe50405750c68115a0dfa76323b7d4c09 /classes/palmtop.bbclass
parenta99c7789254c378cde6a5e1ca015937138d5c52a (diff)
downloadopenembedded-2b95c610452bf38d6c9fb6a3a66f2ecf1050a99c.tar.gz
openembedded-2b95c610452bf38d6c9fb6a3a66f2ecf1050a99c.tar.bz2
openembedded-2b95c610452bf38d6c9fb6a3a66f2ecf1050a99c.zip
palmtop.bbclass: say CONFIG-=thread if we don't build against a multithreaded qt
Diffstat (limited to 'classes/palmtop.bbclass')
-rw-r--r--classes/palmtop.bbclass7
1 files changed, 4 insertions, 3 deletions
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}"