aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-qt
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2015-10-07 00:11:46 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2015-10-13 12:28:15 +0200
commitb0e0273ebb90228618ed5d5a09991126101c0def (patch)
treeac1d93d17005df135de8eff8ac7f526fa9631cf4 /meta-oe/recipes-qt
parent683b8d36e1782d87bc9d7b8e19db2b631d13d6fb (diff)
downloadmeta-openembedded-contrib-b0e0273ebb90228618ed5d5a09991126101c0def.tar.gz
Revert "qcanobserver: Move to nonworking"
* Use PNBLACKLIST instead This reverts commit 8040a4c38bd00e45d50b539affde03deddecd38c. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-qt')
-rw-r--r--meta-oe/recipes-qt/qcanobserver/qcanobserver-socketcan_svn.bb (renamed from meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver-socketcan_svn.bb)1
-rw-r--r--meta-oe/recipes-qt/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch (renamed from meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch)0
-rw-r--r--meta-oe/recipes-qt/qcanobserver/qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch (renamed from meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch)0
-rwxr-xr-xmeta-oe/recipes-qt/qcanobserver/qcanobserver/candemo.xml (renamed from meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/candemo.xml)0
-rw-r--r--meta-oe/recipes-qt/qcanobserver/qcanobserver_svn.bb (renamed from meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver_svn.bb)2
5 files changed, 3 insertions, 0 deletions
diff --git a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver-socketcan_svn.bb b/meta-oe/recipes-qt/qcanobserver/qcanobserver-socketcan_svn.bb
index 9852b0c08b..19ea1ea575 100644
--- a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver-socketcan_svn.bb
+++ b/meta-oe/recipes-qt/qcanobserver/qcanobserver-socketcan_svn.bb
@@ -28,3 +28,4 @@ do_install() {
FILES_${PN} += "${datadir}/qcanobserver/lib"
FILES_${PN}-dbg += "${datadir}/qcanobserver/lib/.debug"
+PNBLACKLIST[qcanobserver-socketcan] ?= "depends on qwt-5 APIs"
diff --git a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch b/meta-oe/recipes-qt/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch
index 1b3da3babf..1b3da3babf 100644
--- a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch
+++ b/meta-oe/recipes-qt/qcanobserver/qcanobserver/0001-messagebufferinterface.cpp-add-sys-socket.h-as-inclu.patch
diff --git a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch b/meta-oe/recipes-qt/qcanobserver/qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch
index 45619237d2..45619237d2 100644
--- a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch
+++ b/meta-oe/recipes-qt/qcanobserver/qcanobserver/0002-qconsole-writethread-gcc-4.5-fixes.patch
diff --git a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/candemo.xml b/meta-oe/recipes-qt/qcanobserver/qcanobserver/candemo.xml
index 304713fdda..304713fdda 100755
--- a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver/candemo.xml
+++ b/meta-oe/recipes-qt/qcanobserver/qcanobserver/candemo.xml
diff --git a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver_svn.bb b/meta-oe/recipes-qt/qcanobserver/qcanobserver_svn.bb
index 4b566f7a33..54e7fc16be 100644
--- a/meta-oe/recipes-qt/nonworking/qcanobserver/qcanobserver_svn.bb
+++ b/meta-oe/recipes-qt/qcanobserver/qcanobserver_svn.bb
@@ -39,3 +39,5 @@ do_install() {
}
FILES_${PN}-dbg += "${datadir}/qcanobserver/.debug"
+
+PNBLACKLIST[qcanobserver] ?= "depends on qwt-5 APIs"