Refactoring doco.

Also remove N900 stuff and document that this is superseded by packaging
stuff in the debian directory.

Change-Id: Ic4db8524a8c6a93984e74fa0866861c353a457f2

34 files changed, 2 insertions, 492 deletions

diff --git a/devices/README b/devices/README
index f1b901f5..a07f54de 100644
--- a/devices/README
+++ b/devices/README
@@ -1,10 +1,5 @@
 This directory contains useful scripts and resources for use when
 using Qt3D on devices.
 
-In the case of devices/n900 the following commands can be used to get a
-set of clickable application launch icons on the N900's apps screen:
-
-cd $DEPOT/qt3d/devices
-scp -r n900/* root@192.168.2.15:/.
-cd $BUILD/qt3d
-scp -r bin/* root@192.168.2.15:/opt/qt3d/bin
+In the case of the N900 and other maemo devices, use the packaging system
+by following the instructions in the debian/rules file.
diff --git a/devices/n900/opt/desktop/declarative/meshes b/devices/n900/opt/desktop/declarative/meshes
deleted file mode 120000
index e9c83ec7..00000000
--- a/devices/n900/opt/desktop/declarative/meshes
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../demos/declarative/meshes
\ No newline at end of file
diff --git a/devices/n900/opt/desktop/declarative/monkeygod b/devices/n900/opt/desktop/declarative/monkeygod
deleted file mode 120000
index 96b8e529..00000000
--- a/devices/n900/opt/desktop/declarative/monkeygod
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../demos/declarative/monkeygod
\ No newline at end of file
diff --git a/devices/n900/opt/desktop/declarative/teapot-shader.qml b/devices/n900/opt/desktop/declarative/teapot-shader.qml
deleted file mode 100644
index 202a0410..00000000
--- a/devices/n900/opt/desktop/declarative/teapot-shader.qml
+++ /dev/null
@@ -1,123 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtQuick3D 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 Nokia Corporation 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 Qt 4.7
-import Qt3D 1.0
-
-Viewport {
-    width: 640; height: 480
-
-Item3D {
-    mesh: Mesh { source: "meshes/teapot.bez" }
-    effect: program
-
-    transform: Rotation3D {
-        NumberAnimation on angle{
-            running: true
-            loops: Animation.Infinite
-            from: 0
-            to: 360
-            duration: 5000
-        }
-        axis: Qt.vector3d(1, -0.3, 0)
-    }
-
-    ShaderProgram {
-        id: program
-        texture: "textures/basket.jpg"
-        property variant texture2 : "textures/qtlogo.png"
-        property real interpolationFactor : 1.0
-
-        SequentialAnimation on interpolationFactor {
-            running: true
-            loops: Animation.Infinite
-            NumberAnimation { to : 1.0; duration: 750; }
-
-
-            PauseAnimation { duration: 550 }
-            NumberAnimation { to : 0.0; duration: 750; }
-            PauseAnimation { duration: 550 }
-        }
-
-        SequentialAnimation on color{
-            running: true
-            loops: Animation.Infinite
-            ColorAnimation {
-                from: "#aaca00"
-                to: "#0033ca"
-                duration: 500
-            }
-            ColorAnimation {
-                from: "#0033ca"
-                to: "#aaca00"
-                duration: 500
-            }
-        }
-
-        vertexShader: "
-            attribute highp vec4 qt_Vertex;
-            attribute highp vec4 qt_MultiTexCoord0;
-            uniform mediump mat4 qt_ModelViewProjectionMatrix;
-            varying highp vec4 texCoord;
-
-            void main(void)
-            {
-                gl_Position = qt_ModelViewProjectionMatrix * qt_Vertex;
-                texCoord = qt_MultiTexCoord0;
-            }
-        "
-        fragmentShader: "
-            varying highp vec4 texCoord;
-            uniform sampler2D qt_Texture0;
-            uniform sampler2D texture2;
-            uniform mediump vec4 qt_Color;
-            uniform mediump float interpolationFactor;
-
-            void main(void)
-            {
-                mediump vec4 col1 = texture2D(qt_Texture0, texCoord.st);
-                mediump vec4 col2 = texture2D(texture2, texCoord.st);
-                gl_FragColor = mix(col1, col2, interpolationFactor);
-            }
-        "
-    }
-}
-
-}
diff --git a/devices/n900/opt/desktop/declarative/teaservice b/devices/n900/opt/desktop/declarative/teaservice
deleted file mode 120000
index 272ea70e..00000000
--- a/devices/n900/opt/desktop/declarative/teaservice
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../demos/declarative/teaservice/
\ No newline at end of file
diff --git a/devices/n900/opt/desktop/declarative/textures b/devices/n900/opt/desktop/declarative/textures
deleted file mode 120000
index 2c1c9bee..00000000
--- a/devices/n900/opt/desktop/declarative/textures
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../demos/declarative/textures
\ No newline at end of file
diff --git a/devices/n900/opt/desktop/scripts/run-qt-no-comp.sh b/devices/n900/opt/desktop/scripts/run-qt-no-comp.sh
deleted file mode 100644
index 167f8398..00000000
--- a/devices/n900/opt/desktop/scripts/run-qt-no-comp.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-#############################################################################
-##
-## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-## All rights reserved.
-## Contact: Nokia Corporation (qt-info@nokia.com)
-##
-## This file is part of the Qt3D module of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, 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.
-##
-## If you have questions regarding the use of this file, please contact
-## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-export QTDIR=/opt/Qt
-export PATH=$QTDIR/bin:/usr/local/bin:/usr/local/sbin:$PATH
-export LD_LIBRARY_PATH=$QTDIR/lib
-/usr/sbin/dsmetool -k /usr/bin/hildon-desktop
-$*
-/usr/sbin/dsmetool -t /usr/bin/hildon-desktop
diff --git a/devices/n900/opt/desktop/scripts/run-qt.sh b/devices/n900/opt/desktop/scripts/run-qt.sh
deleted file mode 100644
index f88a64be..00000000
--- a/devices/n900/opt/desktop/scripts/run-qt.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-#############################################################################
-##
-## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-## All rights reserved.
-## Contact: Nokia Corporation (qt-info@nokia.com)
-##
-## This file is part of the Qt3D module of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, 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.
-##
-## If you have questions regarding the use of this file, please contact
-## Nokia at qt-info@nokia.com.
-##
-##
-##
-##
-##
-##
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-export QTDIR=/opt/Qt
-export PATH=$QTDIR/bin:/usr/local/bin:/usr/local/sbin:$PATH
-export LD_LIBRARY_PATH=$QTDIR/lib
-exec $*
diff --git a/devices/n900/usr/share/applications/hildon/qt3d/basket.desktop b/devices/n900/usr/share/applications/hildon/qt3d/basket.desktop
deleted file mode 100644
index ab815769..00000000
--- a/devices/n900/usr/share/applications/hildon/qt3d/basket.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=basket
-Comment=basket
-Exec=/opt/desktop/scripts/run-qt.sh /opt/qt3d/bin/basket -fullscreen
-Icon=teapot-logo
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
-X-HildonDesk-ShowInToolbar=true
diff --git a/devices/n900/usr/share/applications/hildon/qt3d/colliding3dmice.desktop b/devices/n900/usr/share/applications/hildon/qt3d/colliding3dmice.desktop
deleted file mode 100644
index 67e12d3a..00000000
--- a/devices/n900/usr/share/applications/hildon/qt3d/colliding3dmice.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=colliding3dmice
-Comment=colliding3dmice
-Exec=/opt/desktop/scripts/run-qt.sh /opt/qt3d/bin/colliding3dmice -fullscreen
-Icon=teapot-logo
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
-X-HildonDesk-ShowInToolbar=true
diff --git a/devices/n900/usr/share/applications/hildon/qt3d/cube.desktop b/devices/n900/usr/share/applications/hildon/qt3d/cube.desktop
deleted file mode 100644
index 6260881b..00000000
--- a/devices/n900/usr/share/applications/hildon/qt3d/cube.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=cube
-Comment=cube
-Exec=/opt/desktop/scripts/run-qt.sh /opt/qt3d/bin/cube -fullscreen
-Icon=teapot-logo
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
-X-HildonDesk-ShowInToolbar=true
diff --git a/devices/n900/usr/share/applications/hildon/qt3d/cubehouse.desktop b/devices/n900/usr/share/applications/hildon/qt3d/cubehouse.desktop
deleted file mode 100644
index 108c0e5d..00000000
--- a/devices/n900/usr/share/applications/hildon/qt3d/cubehouse.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=cubehouse
-Comment=cubehouse
-Exec=/opt/desktop/scripts/run-qt.sh /opt/qt3d/bin/cubehouse -fullscreen
-Icon=teapot-logo
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
-X-HildonDesk-ShowInToolbar=true
diff --git a/devices/n900/usr/share/applications/hildon/qt3d/displaylist.desktop b/devices/n900/usr/share/applications/hildon/qt3d/displaylist.desktop
deleted file mode 100644
index 9c4ba702..00000000
--- a/devices/n900/usr/share/applications/hildon/qt3d/displaylist.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=displaylist
-Comment=displaylist
-Exec=/opt/desktop/scripts/run-qt.sh /opt/qt3d/bin/displaylist -fullscreen
-Icon=teapot-logo
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
-X-HildonDesk-ShowInToolbar=true
diff --git a/devices/n900/usr/share/applications/hildon/qt3d/geometry.desktop b/devices/n900/usr/share/applications/hildon/qt3d/geometry.desktop
deleted file mode 100644
index 8de3f9a6..00000000
--- a/devices/n900/usr/share/applications/hildon/qt3d/geometry.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=geometry
-Comment=geometry
-Exec=/opt/desktop/scripts/run-qt.sh /opt/qt3d/bin/geometry -fullscreen
-Icon=teapot-logo
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
-X-HildonDesk-ShowInToolbar=true
diff --git a/devices/n900/usr/share/applications/hildon/qt3d/graphicsview.desktop b/devices/n900/usr/share/applications/hildon/qt3d/graphicsview.desktop
deleted file mode 100644
index 1c734856..00000000
--- a/devices/n900/usr/share/applications/hildon/qt3d/graphicsview.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=graphicsview
-Comment=graphicsview
-Exec=/opt/desktop/scripts/run-qt.sh /opt/qt3d/bin/graphicsview -fullscreen
-Icon=teapot-logo
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
-X-HildonDesk-ShowInToolbar=true
diff --git a/devices/n900/usr/share/applications/hildon/qt3d/modelviewer.desktop b/devices/n900/usr/share/applications/hildon/qt3d/modelviewer.desktop
deleted file mode 100644
index 7c64bddc..00000000
--- a/devices/n900/usr/share/applications/hildon/qt3d/modelviewer.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=modelviewer
-Comment=modelviewer
-Exec=/opt/desktop/scripts/run-qt.sh /opt/qt3d/bin/modelviewer -fullscreen
-Icon=teapot-logo
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
-X-HildonDesk-ShowInToolbar=true
diff --git a/devices/n900/usr/share/applications/hildon/qt3d/monkeygod.desktop b/devices/n900/usr/share/applications/hildon/qt3d/monkeygod.desktop
deleted file mode 100644
index c8161daa..00000000
--- a/devices/n900/usr/share/applications/hildon/qt3d/monkeygod.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=monkeygod
-Comment=monkeygod
-Exec=/opt/desktop/scripts/run-qt.sh qmlviewer -opengl /opt/desktop/declarative/monkeygod/monkeygod_no_platform.qml
-Icon=qml3d-logo
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
-X-HildonDesk-ShowInToolbar=true
diff --git a/devices/n900/usr/share/applications/hildon/qt3d/nesting.desktop b/devices/n900/usr/share/applications/hildon/qt3d/nesting.desktop
deleted file mode 100644
index 271ac9df..00000000
--- a/devices/n900/usr/share/applications/hildon/qt3d/nesting.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=nesting
-Comment=nesting
-Exec=/opt/desktop/scripts/run-qt.sh /opt/qt3d/bin/nesting -fullscreen
-Icon=teapot-logo
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
-X-HildonDesk-ShowInToolbar=true
diff --git a/devices/n900/usr/share/applications/hildon/qt3d/pageflip.desktop b/devices/n900/usr/share/applications/hildon/qt3d/pageflip.desktop
deleted file mode 100644
index 3b982b5a..00000000
--- a/devices/n900/usr/share/applications/hildon/qt3d/pageflip.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=pageflip
-Comment=pageflip
-Exec=/opt/desktop/scripts/run-qt.sh /opt/qt3d/bin/pageflip -fullscreen
-Icon=teapot-logo
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
-X-HildonDesk-ShowInToolbar=true
diff --git a/devices/n900/usr/share/applications/hildon/qt3d/painter.desktop b/devices/n900/usr/share/applications/hildon/qt3d/painter.desktop
deleted file mode 100644
index e7ddeb30..00000000
--- a/devices/n900/usr/share/applications/hildon/qt3d/painter.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=painter
-Comment=painter
-Exec=/opt/desktop/scripts/run-qt.sh /opt/qt3d/bin/painter -fullscreen
-Icon=teapot-logo
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
-X-HildonDesk-ShowInToolbar=true
diff --git a/devices/n900/usr/share/applications/hildon/qt3d/photobrowser3d.desktop b/devices/n900/usr/share/applications/hildon/qt3d/photobrowser3d.desktop
deleted file mode 100644
index 1a959cf0..00000000
--- a/devices/n900/usr/share/applications/hildon/qt3d/photobrowser3d.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=photo3d
-Comment=photo3d
-Exec=/opt/desktop/scripts/run-qt.sh /opt/qt3d/bin/photobrowser3d -fullscreen
-Icon=teapot-logo
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
-X-HildonDesk-ShowInToolbar=true
diff --git a/devices/n900/usr/share/applications/hildon/qt3d/pie.desktop b/devices/n900/usr/share/applications/hildon/qt3d/pie.desktop
deleted file mode 100644
index 5a8ae807..00000000
--- a/devices/n900/usr/share/applications/hildon/qt3d/pie.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=pie
-Comment=pie
-Exec=/opt/desktop/scripts/run-qt.sh /opt/qt3d/bin/pie -fullscreen
-Icon=teapot-logo
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
-X-HildonDesk-ShowInToolbar=true
diff --git a/devices/n900/usr/share/applications/hildon/qt3d/planets.desktop b/devices/n900/usr/share/applications/hildon/qt3d/planets.desktop
deleted file mode 100644
index 066d9235..00000000
--- a/devices/n900/usr/share/applications/hildon/qt3d/planets.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=planets
-Comment=planets
-Exec=/opt/desktop/scripts/run-qt.sh /opt/qt3d/bin/planets -fullscreen
-Icon=teapot-logo
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
-X-HildonDesk-ShowInToolbar=true
diff --git a/devices/n900/usr/share/applications/hildon/qt3d/pvcolor.desktop b/devices/n900/usr/share/applications/hildon/qt3d/pvcolor.desktop
deleted file mode 100644
index 730799f6..00000000
--- a/devices/n900/usr/share/applications/hildon/qt3d/pvcolor.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=pvcolor
-Comment=pvcolor
-Exec=/opt/desktop/scripts/run-qt.sh /opt/qt3d/bin/pvcolor -fullscreen
-Icon=teapot-logo
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
-X-HildonDesk-ShowInToolbar=true
diff --git a/devices/n900/usr/share/applications/hildon/qt3d/qglinfo.desktop b/devices/n900/usr/share/applications/hildon/qt3d/qglinfo.desktop
deleted file mode 100644
index 2ba89151..00000000
--- a/devices/n900/usr/share/applications/hildon/qt3d/qglinfo.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=qglinfo
-Comment=qglinfo
-Exec=/opt/desktop/scripts/run-qt.sh /opt/qt3d/bin/qglinfo -fullscreen
-Icon=teapot-logo
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
-X-HildonDesk-ShowInToolbar=true
diff --git a/devices/n900/usr/share/applications/hildon/qt3d/qpainter.desktop b/devices/n900/usr/share/applications/hildon/qt3d/qpainter.desktop
deleted file mode 100644
index 5360e495..00000000
--- a/devices/n900/usr/share/applications/hildon/qt3d/qpainter.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=qpainter
-Comment=qpainter
-Exec=/opt/desktop/scripts/run-qt.sh /opt/qt3d/bin/qpainter -fullscreen
-Icon=teapot-logo
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
-X-HildonDesk-ShowInToolbar=true
diff --git a/devices/n900/usr/share/applications/hildon/qt3d/shapes.desktop b/devices/n900/usr/share/applications/hildon/qt3d/shapes.desktop
deleted file mode 100644
index fac05fa0..00000000
--- a/devices/n900/usr/share/applications/hildon/qt3d/shapes.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=shapes
-Comment=shapes
-Exec=/opt/desktop/scripts/run-qt.sh /opt/qt3d/bin/shapes -fullscreen
-Icon=teapot-logo
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
-X-HildonDesk-ShowInToolbar=true
diff --git a/devices/n900/usr/share/applications/hildon/qt3d/stereo.desktop b/devices/n900/usr/share/applications/hildon/qt3d/stereo.desktop
deleted file mode 100644
index ecf78841..00000000
--- a/devices/n900/usr/share/applications/hildon/qt3d/stereo.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=stereo
-Comment=stereo
-Exec=/opt/desktop/scripts/run-qt.sh /opt/qt3d/bin/stereo -fullscreen
-Icon=teapot-logo
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
-X-HildonDesk-ShowInToolbar=true
diff --git a/devices/n900/usr/share/applications/hildon/qt3d/stereophoto.desktop b/devices/n900/usr/share/applications/hildon/qt3d/stereophoto.desktop
deleted file mode 100644
index b9efa1f3..00000000
--- a/devices/n900/usr/share/applications/hildon/qt3d/stereophoto.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=stereophoto
-Comment=stereophoto
-Exec=/opt/desktop/scripts/run-qt.sh /opt/qt3d/bin/stereophoto -fullscreen
-Icon=teapot-logo
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
-X-HildonDesk-ShowInToolbar=true
diff --git a/devices/n900/usr/share/applications/hildon/qt3d/teapot-shader.desktop b/devices/n900/usr/share/applications/hildon/qt3d/teapot-shader.desktop
deleted file mode 100644
index 5bf6ba11..00000000
--- a/devices/n900/usr/share/applications/hildon/qt3d/teapot-shader.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=teashader
-Comment=teashader
-Exec=/opt/desktop/scripts/run-qt.sh qmlviewer -opengl /opt/desktop/declarative/teapot-shader.qml
-Icon=qml3d-logo
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
-X-HildonDesk-ShowInToolbar=true
diff --git a/devices/n900/usr/share/applications/hildon/qt3d/teapot.desktop b/devices/n900/usr/share/applications/hildon/qt3d/teapot.desktop
deleted file mode 100644
index 2470ae21..00000000
--- a/devices/n900/usr/share/applications/hildon/qt3d/teapot.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=teapot
-Comment=teapot
-Exec=/opt/desktop/scripts/run-qt.sh /opt/qt3d/bin/teapot -fullscreen
-Icon=teapot-logo
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
-X-HildonDesk-ShowInToolbar=true
diff --git a/devices/n900/usr/share/applications/hildon/qt3d/teaservice.desktop b/devices/n900/usr/share/applications/hildon/qt3d/teaservice.desktop
deleted file mode 100644
index 04f84675..00000000
--- a/devices/n900/usr/share/applications/hildon/qt3d/teaservice.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=teaservice
-Comment=teaservice
-Exec=/opt/desktop/scripts/run-qt.sh qmlviewer -opengl opt/desktop/declarative/teaservice/teaservice.qml
-Icon=qml3d-logo
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
-X-HildonDesk-ShowInToolbar=true
diff --git a/devices/n900/usr/share/pixmaps/qml3d-logo.png b/devices/n900/usr/share/pixmaps/qml3d-logo.png
deleted file mode 100644
index 3386950b..00000000
--- a/devices/n900/usr/share/pixmaps/qml3d-logo.png
+++ /dev/null
diff --git a/devices/n900/usr/share/pixmaps/teapot-logo.png b/devices/n900/usr/share/pixmaps/teapot-logo.png
deleted file mode 100644
index 3532b520..00000000
--- a/devices/n900/usr/share/pixmaps/teapot-logo.png
+++ /dev/null