From 2738c57e51b4fcb70f25ea4ff46c966ce5287c27 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Mon, 5 Mar 2012 15:40:59 +1000
Subject: Fix renaming merge with examples

Some examples were duplicated a few times. Removing the excess.

Change-Id: I6fa59f79de63ac952103421ba1c063f5912b702b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
---
 .../particles/plasmapatrol/content/ChoiceBox.qml   | 105 ---------------------
 1 file changed, 105 deletions(-)
 delete mode 100644 examples/qml/particles/plasmapatrol/content/ChoiceBox.qml

(limited to 'examples/qml/particles/plasmapatrol/content/ChoiceBox.qml')

diff --git a/examples/qml/particles/plasmapatrol/content/ChoiceBox.qml b/examples/qml/particles/plasmapatrol/content/ChoiceBox.qml
deleted file mode 100644
index 6e21101f2e..0000000000
--- a/examples/qml/particles/plasmapatrol/content/ChoiceBox.qml
+++ /dev/null
@@ -1,105 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Item {
-    id: container
-    width: 360
-    height: 160
-    property ParticleSystem system
-    Ship {
-        id: nully
-        system: system
-    }
-    property Item target: nully
-    /*
-    Component.onCompleted: {
-        container.target.shipType = 1
-        container.target.gunType = 1
-    }
-    */
-    Row {
-        anchors.horizontalCenter: parent.horizontalCenter
-        height: parent.height
-        spacing: 8
-        Button {
-            width: 80
-            height: 80
-            anchors.verticalCenter: parent.verticalCenter
-            text: "Cycle\nShip"
-            onClicked: {
-                var nextVal = container.target.shipType;
-                if(nextVal == 3)
-                    nextVal = 1;
-                else 
-                    nextVal++;
-                container.target.shipType = nextVal;
-            }
-        }
-        Item {
-            width: 128
-            height: 128
-            anchors.verticalCenter: parent.verticalCenter
-            Ship {
-                hp: 20
-                anchors.centerIn: parent
-                shipType: container.target.shipType
-                gunType: container.target.gunType
-                system: container.system
-            }
-        }
-        Button {
-            width: 80
-            height: 80
-            anchors.verticalCenter: parent.verticalCenter
-            text: "Cycle\nGun"
-            onClicked: {
-                var nextVal = container.target.gunType;
-                if(nextVal == 3)
-                    nextVal = 1;
-                else 
-                    nextVal++;
-                container.target.gunType = nextVal;
-            }
-        }
-    }
-}
-- 
cgit v1.2.3