summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorSarah Smith <sarah.j.smith@nokia.com>2012-06-18 16:21:50 +1000
committerQt by Nokia <qt-info@nokia.com>2012-06-19 07:31:35 +0200
commit919d331c2365db0c6d3ca323313b6065a123e6a1 (patch)
tree545e3713762532c90a8d6fee6a84d7c7c8ab5495 /demos
parent247cc1c39f9479f80e1af9757a9fb1e8da142103 (diff)
Remove device specific files.
These files are no longer required. Change-Id: Idb2cdb73efce40897f3ed625e82ae4220f97598b Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
Diffstat (limited to 'demos')
-rw-r--r--demos/quick3d/flickr3d/flickr3d.pro1
-rw-r--r--demos/quick3d/flickr3d/info.json13
-rw-r--r--demos/quick3d/flickr3d/mt.qml53
-rw-r--r--demos/quick3d/robo_bounce/info.json13
-rw-r--r--demos/quick3d/robo_bounce/mt.qml53
-rw-r--r--demos/quick3d/robo_bounce/robo_bounce.pro1
-rw-r--r--demos/quick3d/tea_service/info.json13
-rw-r--r--demos/quick3d/tea_service/mt.qml53
-rw-r--r--demos/quick3d/tea_service/tea_service.pro4
9 files changed, 0 insertions, 204 deletions
diff --git a/demos/quick3d/flickr3d/flickr3d.pro b/demos/quick3d/flickr3d/flickr3d.pro
index 823cbbf41..3254ac1f9 100644
--- a/demos/quick3d/flickr3d/flickr3d.pro
+++ b/demos/quick3d/flickr3d/flickr3d.pro
@@ -26,7 +26,6 @@ CATEGORY = demos
include(../../../pkg.pri)
OTHER_FILES += \
- mt.qml \
flickr3d.rc \
$$QML_INFRA_FILES
diff --git a/demos/quick3d/flickr3d/info.json b/demos/quick3d/flickr3d/info.json
deleted file mode 100644
index 261106e88..000000000
--- a/demos/quick3d/flickr3d/info.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "info-version": "1.0",
- "dict": {
- "Category": "application",
- "Runtime": "qml",
- "DisplayName": "Flickr3d",
- "Subcategory": "utility",
- "MainQML": "mt.qml",
- "Version": "1.0",
- "Identifier": "com.nokia.qt3d.flickr3d",
- "Summary": "Flickr3d QML Demo"
- }
-}
diff --git a/demos/quick3d/flickr3d/mt.qml b/demos/quick3d/flickr3d/mt.qml
deleted file mode 100644
index fcca14470..000000000
--- a/demos/quick3d/flickr3d/mt.qml
+++ /dev/null
@@ -1,53 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the Qt3D examples 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 Qt3D 1.0
-import Qt3D.Shapes 1.0
-import "qml"
-
-Item {
- width: 320
- height: 480
-
- Flickr3d {
- }
-}
diff --git a/demos/quick3d/robo_bounce/info.json b/demos/quick3d/robo_bounce/info.json
deleted file mode 100644
index f6b579517..000000000
--- a/demos/quick3d/robo_bounce/info.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "info-version": "1.0",
- "dict": {
- "Category": "application",
- "Runtime": "qml",
- "DisplayName": "Robo Bounce",
- "Subcategory": "utility",
- "MainQML": "mt.qml",
- "Version": "1.0",
- "Identifier": "com.nokia.qt3d.robobounce",
- "Summary": "Robo Bounce QML Demo"
- }
-}
diff --git a/demos/quick3d/robo_bounce/mt.qml b/demos/quick3d/robo_bounce/mt.qml
deleted file mode 100644
index 2d142d283..000000000
--- a/demos/quick3d/robo_bounce/mt.qml
+++ /dev/null
@@ -1,53 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the Qt3D examples 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 Qt3D 1.0
-import Qt3D.Shapes 1.0
-import "qml"
-
-Item {
- width: 320
- height: 480
-
- RoboBounce {
- }
-}
diff --git a/demos/quick3d/robo_bounce/robo_bounce.pro b/demos/quick3d/robo_bounce/robo_bounce.pro
index c1ebfedea..319161a80 100644
--- a/demos/quick3d/robo_bounce/robo_bounce.pro
+++ b/demos/quick3d/robo_bounce/robo_bounce.pro
@@ -49,7 +49,6 @@ include(../../../pkg.pri)
RC_FILE = robo_bounce.rc
OTHER_FILES += \
- mt.qml \
robo_bounce.rc \
$$QML_INFRA_FILES \
$$RC_FILE
diff --git a/demos/quick3d/tea_service/info.json b/demos/quick3d/tea_service/info.json
deleted file mode 100644
index c0cba1e74..000000000
--- a/demos/quick3d/tea_service/info.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "info-version": "1.0",
- "dict": {
- "Category": "application",
- "Runtime": "qml",
- "DisplayName": "Tea Service QML",
- "Subcategory": "utility",
- "MainQML": "mt.qml",
- "Version": "1.0",
- "Identifier": "com.nokia.qt3d.teaserviceqml",
- "Summary": "Tea Service QML Demo"
- }
-}
diff --git a/demos/quick3d/tea_service/mt.qml b/demos/quick3d/tea_service/mt.qml
deleted file mode 100644
index d87a0f5a9..000000000
--- a/demos/quick3d/tea_service/mt.qml
+++ /dev/null
@@ -1,53 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the Qt3D examples 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 Qt3D 1.0
-import Qt3D.Shapes 1.0
-import "qml"
-
-Item {
- width: 320
- height: 480
-
- TeaService {
- }
-}
diff --git a/demos/quick3d/tea_service/tea_service.pro b/demos/quick3d/tea_service/tea_service.pro
index a6440ef39..b1c81cfaf 100644
--- a/demos/quick3d/tea_service/tea_service.pro
+++ b/demos/quick3d/tea_service/tea_service.pro
@@ -24,11 +24,7 @@ CATEGORY = demos
include(../../../pkg.pri)
OTHER_FILES += \
- mt.qml \
$$QML_INFRA_FILES \
tea_service.rc
-INSTALL_DIRS = qml
-mt: INSTALL_FILES = mt.qml
-
RC_FILE = tea_service.rc