Remove 3DItem and VideoItem items from mapviewer example.

Change-Id: I2b5fb05a6cab0b944bd3e3a3dff94a15a12d91be
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

7 files changed, 4 insertions, 224 deletions

diff --git a/examples/location/location.pro b/examples/location/location.pro
index c186b7fc..816d739d 100644
--- a/examples/location/location.pro
+++ b/examples/location/location.pro
@@ -3,7 +3,6 @@ TEMPLATE = subdirs
 qtHaveModule(quick) {
     SUBDIRS += places \
                places_list \
-               places_map
-
-    qtHaveModule(multimedia): SUBDIRS += mapviewer
+               places_map \
+               mapviewer
 }
diff --git a/examples/location/mapviewer/content/map/3dItem.qml b/examples/location/mapviewer/content/map/3dItem.qml
deleted file mode 100644
index 43126476..00000000
--- a/examples/location/mapviewer/content/map/3dItem.qml
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-import QtQuick 2.0;
-import QtLocation 5.3
-import QtQuick 2.0
-import Qt3D 2.0
-import Qt3D.Shapes 2.0
-
-// NOTE: If the creation of this compoment fails, make sure you have the latest
-// qtquick3d (qml2 branch) and qtdeclarative installed.
-// You can test your system with qtquick3d examples.
-MapQuickItem {  //to be used inside MapComponent only
-    id: mapItem
-
-    //    zoomLevel: 8 // set this if you want the item to follow zoom level changes
-
-    function setGeometry(markers, index) {
-        coordinate.latitude = markers[index].coordinate.latitude
-        coordinate.longitude = markers[index].coordinate.longitude
-    }
-
-    anchorPoint.x: testItem.width/2
-    anchorPoint.y: testItem.height/2
-
-    sourceItem: Item {
-        id: testItem
-        width: 100
-        height: 100
-        Viewport {
-            width: parent.width; height: parent.height
-            renderMode: "BufferedRender"
-            navigation: false // set this true if you want to rotate/zoom with mouse
-                              // but that interferes with map panning on 3d item area
-            Cube {
-                scale: 2
-                transform: [
-                    Rotation3D {
-                        angle: 45
-                        axis: Qt.vector3d(1, 0, 1)
-                    },
-                    Rotation3D {
-                        id: spin
-                        angle: 0
-                        axis: Qt.vector3d(0, 1, 0)
-                    }]
-
-                NumberAnimation {
-                    target: spin
-                    property: "angle"
-                    from: 0
-                    to: 360; duration: 5000; running: true
-                    loops: NumberAnimation.Infinite }
-
-                effect: Effect {
-                    color: "#aaca00"
-                    texture: "../../icon.png"
-                    decal: true
-                }
-            }
-        }
-    }
-}
diff --git a/examples/location/mapviewer/content/map/MapComponent.qml b/examples/location/mapviewer/content/map/MapComponent.qml
index dfa8ec23..d3829593 100644
--- a/examples/location/mapviewer/content/map/MapComponent.qml
+++ b/examples/location/mapviewer/content/map/MapComponent.qml
@@ -707,15 +707,6 @@ Map {
                 break;
             }
 
-            case "Video": {
-                addGeoItem("VideoItem")
-                break;
-            }
-
-            case "3D QML Item": {
-                addGeoItem("3dItem")
-                break;
-            }
             }
         }
     }
@@ -1049,8 +1040,6 @@ Map {
         drawMenu.clear()
 
         drawMenu.addItem("Image")
-        drawMenu.addItem("Video")
-        drawMenu.addItem("3D QML Item")
 
         if (currentMarker <= length-2){
             drawMenu.addItem("Rectangle")
diff --git a/examples/location/mapviewer/content/map/VideoItem.qml b/examples/location/mapviewer/content/map/VideoItem.qml
deleted file mode 100644
index 97963a1f..00000000
--- a/examples/location/mapviewer/content/map/VideoItem.qml
+++ /dev/null
@@ -1,91 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-import QtQuick 2.0;
-import QtLocation 5.3
-import QtMultimedia 5.0
-
-// NOTE: If the creation of this compoment fails, make sure you have the latest
-// qtmultimedia and relevant gstreamer etc packages installed.
-// You can test your system with qtmultimedia examples.
-MapQuickItem {  //to be used inside MapComponent only
-    id: testVideoItem
-
-    //    zoomLevel: 8 // set this if you want the video to follow zoom level changes
-
-    function setGeometry(markers, index) {
-        coordinate.latitude = markers[index].coordinate.latitude
-        coordinate.longitude = markers[index].coordinate.longitude
-    }
-
-    sourceItem: Rectangle {
-        id: testVideo
-        color: "black"
-        x: 0;
-        y: 0;
-        z: 500
-        width: 176;
-        height: 144;
-        MediaPlayer {
-            id: player
-            source: "file://" + appDirPath + "/demo.ogv"
-            autoPlay: true
-
-            onError: {
-                if (MediaPlayer.NoError != error) {
-                    console.log(errorString)
-                }
-            }
-        }
-        VideoOutput {
-            id: videoItem
-            source: player
-            anchors.fill: parent
-        }
-        MouseArea{
-            anchors.fill: parent
-            onClicked: {
-                if (player.playbackState == MediaPlayer.PlayingState)
-                    player.stop()
-                else
-                    player.play()
-            }
-        }
-    }
-}
diff --git a/examples/location/mapviewer/demo.ogv b/examples/location/mapviewer/demo.ogv
deleted file mode 100644
index 1ed7e540..00000000
--- a/examples/location/mapviewer/demo.ogv
+++ /dev/null
diff --git a/examples/location/mapviewer/mapviewer.pro b/examples/location/mapviewer/mapviewer.pro
index 8c667498..43d5bc9d 100644
--- a/examples/location/mapviewer/mapviewer.pro
+++ b/examples/location/mapviewer/mapviewer.pro
@@ -8,8 +8,8 @@ RESOURCES += \
     mapviewerwrapper.qrc
 
 qmlcontent.files += \
-    mapviewer.qml \
-    demo.ogv
+    mapviewer.qml
+
 OTHER_FILES += $$qmlcontent.files
 
 qmlcontentmap.files += \
@@ -20,8 +20,6 @@ qmlcontentmap.files += \
     content/map/PolylineItem.qml \
     content/map/PolygonItem.qml \
     content/map/ImageItem.qml \
-    content/map/VideoItem.qml \
-    content/map/3dItem.qml \
     content/map/MiniMap.qml
 OTHER_FILES += $$qmlcontentmap.files
 
@@ -36,16 +34,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/location/mapviewer
 additional.files = ../common
 additional.path = $$[QT_INSTALL_EXAMPLES]/location/common
 INSTALLS += target additional
-
-# ensure copying of media file while shadow building
-!equals($${_PRO_FILE_PWD_}, $${OUT_PWD}) {
-    MEDIAFILE = $${_PRO_FILE_PWD_}/demo.ogv
-    copy2build.input = MEDIAFILE
-    copy2build.output = $${OUT_PWD}/demo.ogv
-    !contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS
-    copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-    copy2build.name = COPY ${QMAKE_FILE_IN}
-    copy2build.CONFIG += no_link
-    copy2build.CONFIG += no_clean
-    QMAKE_EXTRA_COMPILERS += copy2build
-}
diff --git a/examples/location/mapviewer/mapviewerwrapper.qrc b/examples/location/mapviewer/mapviewerwrapper.qrc
index 854a6503..e8fe4df6 100644
--- a/examples/location/mapviewer/mapviewerwrapper.qrc
+++ b/examples/location/mapviewer/mapviewerwrapper.qrc
@@ -11,9 +11,6 @@
         <file>content/dialogs/Message.qml</file>
         <file>content/dialogs/RouteDialog.qml</file>
         <file>content/map/ImageItem.qml</file>
-        <file>content/map/VideoItem.qml</file>
-        <file>content/map/3dItem.qml</file>
         <file>content/map/MiniMap.qml</file>
-        <file>demo.ogv</file>
     </qresource>
 </RCC>