From 9248b3195671fbc46e995c0b5c8681569e91834d Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Wed, 16 Dec 2015 18:50:04 +0100
Subject: [PATCH] Revert "meta-digi-dey: add desktop shortcut for camera demo
 app"

This demo app is very generic and does not play well with FSL gstreamer
plugin, so using it just crashes in different ways (doing a camera zoom,
recording a video, etc)

This reverts commit 2776dcd654f0993b4dfac15a54c8274ea067e644.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../demo-extrafiles/qt5-demo-extrafiles.bbappend |   6 ------
 .../qt5-demo-extrafiles/qmlcamera.desktop        |   9 ---------
 .../qt5-demo-extrafiles/qmlcamera.png            | Bin 3317 -> 0 bytes
 3 files changed, 15 deletions(-)
 delete mode 100644 meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles/qmlcamera.desktop
 delete mode 100644 meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles/qmlcamera.png

diff --git a/meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles.bbappend b/meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles.bbappend
index 01bdef4c2..1709250bd 100644
--- a/meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles.bbappend
+++ b/meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles.bbappend
@@ -3,8 +3,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
 SRC_URI += " \
-    file://qmlcamera.desktop \
-    file://qmlcamera.png \
     file://qmlvideo.desktop \
     file://qmlvideo.png \
 "
@@ -13,10 +11,6 @@ do_install_append () {
 	# Fix path for OpenGLES example
 	sed -i -e '/Exec/{s,hellogl_es2,hellogl2,g}' ${D}${datadir}/applications/hellogl_es2.desktop
 
-	# Add qmlcamera shortcut
-	install -m 0644 ${WORKDIR}/qmlcamera.desktop ${D}${datadir}/applications/
-	install -m 0644 ${WORKDIR}/qmlcamera.png ${D}${datadir}/pixmaps/
-
 	# Add qmlvideo shortcut
 	install -m 0644 ${WORKDIR}/qmlvideo.desktop ${D}${datadir}/applications/
 	install -m 0644 ${WORKDIR}/qmlvideo.png ${D}${datadir}/pixmaps/
diff --git a/meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles/qmlcamera.desktop b/meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles/qmlcamera.desktop
deleted file mode 100644
index 33104c2a5..000000000
--- a/meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles/qmlcamera.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Qt5 Camera
-Exec=/bin/sh -c "cd /usr/share/qt5/examples/multimedia/declarative-camera; ./declarative-camera"
-Icon=qmlcamera
-Terminal=false
-Type=Application
-X-MB-SingleInstance=true
-Comment=Qt5 Qml Camera demo application
-StartupNotify=false
diff --git a/meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles/qmlcamera.png b/meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles/qmlcamera.png
deleted file mode 100644
index cc67fa86c674f8a1932d3d992dbb262368148553..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3317
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