diff options
author | Sarah Smith <sarah.j.smith@nokia.com> | 2011-03-09 17:08:07 +1000 |
---|---|---|
committer | Sarah Smith <sarah.j.smith@nokia.com> | 2011-03-09 17:43:07 +1000 |
commit | b87a08f5292069facf9b427cb43a675d43578293 (patch) | |
tree | af3efc8960a3e556e15b7b66f81821b01297c366 /devices |
Add files ported from research/qt3d
Fill repo with some of the files from the research/qt3d project. At
present the new project builds under MacOSX. To-dos include getting it
building under linux, windows, harmattan and maemo/meego; updating the
documentation to reflect the new QtQuick focus; and fixing the issues
with private headers.
Diffstat (limited to 'devices')
35 files changed, 559 insertions, 0 deletions
diff --git a/devices/README b/devices/README new file mode 100644 index 00000000..f1b901f5 --- /dev/null +++ b/devices/README @@ -0,0 +1,10 @@ +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 diff --git a/devices/n900/opt/desktop/declarative/meshes b/devices/n900/opt/desktop/declarative/meshes new file mode 120000 index 00000000..e9c83ec7 --- /dev/null +++ b/devices/n900/opt/desktop/declarative/meshes @@ -0,0 +1 @@ +../../../../../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 new file mode 120000 index 00000000..96b8e529 --- /dev/null +++ b/devices/n900/opt/desktop/declarative/monkeygod @@ -0,0 +1 @@ +../../../../../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 new file mode 100644 index 00000000..202a0410 --- /dev/null +++ b/devices/n900/opt/desktop/declarative/teapot-shader.qml @@ -0,0 +1,123 @@ +/**************************************************************************** +** +** 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 new file mode 120000 index 00000000..272ea70e --- /dev/null +++ b/devices/n900/opt/desktop/declarative/teaservice @@ -0,0 +1 @@ +../../../../../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 new file mode 120000 index 00000000..2c1c9bee --- /dev/null +++ b/devices/n900/opt/desktop/declarative/textures @@ -0,0 +1 @@ +../../../../../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 new file mode 100644 index 00000000..167f8398 --- /dev/null +++ b/devices/n900/opt/desktop/scripts/run-qt-no-comp.sh @@ -0,0 +1,48 @@ +#!/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 new file mode 100644 index 00000000..f88a64be --- /dev/null +++ b/devices/n900/opt/desktop/scripts/run-qt.sh @@ -0,0 +1,46 @@ +#!/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 new file mode 100644 index 00000000..ab815769 --- /dev/null +++ b/devices/n900/usr/share/applications/hildon/qt3d/basket.desktop @@ -0,0 +1,11 @@ +[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 new file mode 100644 index 00000000..67e12d3a --- /dev/null +++ b/devices/n900/usr/share/applications/hildon/qt3d/colliding3dmice.desktop @@ -0,0 +1,11 @@ +[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 new file mode 100644 index 00000000..6260881b --- /dev/null +++ b/devices/n900/usr/share/applications/hildon/qt3d/cube.desktop @@ -0,0 +1,11 @@ +[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 new file mode 100644 index 00000000..108c0e5d --- /dev/null +++ b/devices/n900/usr/share/applications/hildon/qt3d/cubehouse.desktop @@ -0,0 +1,11 @@ +[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 new file mode 100644 index 00000000..9c4ba702 --- /dev/null +++ b/devices/n900/usr/share/applications/hildon/qt3d/displaylist.desktop @@ -0,0 +1,11 @@ +[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 new file mode 100644 index 00000000..8de3f9a6 --- /dev/null +++ b/devices/n900/usr/share/applications/hildon/qt3d/geometry.desktop @@ -0,0 +1,11 @@ +[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 new file mode 100644 index 00000000..1c734856 --- /dev/null +++ b/devices/n900/usr/share/applications/hildon/qt3d/graphicsview.desktop @@ -0,0 +1,11 @@ +[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 new file mode 100644 index 00000000..7c64bddc --- /dev/null +++ b/devices/n900/usr/share/applications/hildon/qt3d/modelviewer.desktop @@ -0,0 +1,11 @@ +[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 new file mode 100644 index 00000000..c8161daa --- /dev/null +++ b/devices/n900/usr/share/applications/hildon/qt3d/monkeygod.desktop @@ -0,0 +1,11 @@ +[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 new file mode 100644 index 00000000..271ac9df --- /dev/null +++ b/devices/n900/usr/share/applications/hildon/qt3d/nesting.desktop @@ -0,0 +1,11 @@ +[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 new file mode 100644 index 00000000..3b982b5a --- /dev/null +++ b/devices/n900/usr/share/applications/hildon/qt3d/pageflip.desktop @@ -0,0 +1,11 @@ +[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 new file mode 100644 index 00000000..e7ddeb30 --- /dev/null +++ b/devices/n900/usr/share/applications/hildon/qt3d/painter.desktop @@ -0,0 +1,11 @@ +[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 new file mode 100644 index 00000000..1a959cf0 --- /dev/null +++ b/devices/n900/usr/share/applications/hildon/qt3d/photobrowser3d.desktop @@ -0,0 +1,11 @@ +[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 new file mode 100644 index 00000000..5a8ae807 --- /dev/null +++ b/devices/n900/usr/share/applications/hildon/qt3d/pie.desktop @@ -0,0 +1,11 @@ +[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 new file mode 100644 index 00000000..066d9235 --- /dev/null +++ b/devices/n900/usr/share/applications/hildon/qt3d/planets.desktop @@ -0,0 +1,11 @@ +[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 new file mode 100644 index 00000000..730799f6 --- /dev/null +++ b/devices/n900/usr/share/applications/hildon/qt3d/pvcolor.desktop @@ -0,0 +1,11 @@ +[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 new file mode 100644 index 00000000..2ba89151 --- /dev/null +++ b/devices/n900/usr/share/applications/hildon/qt3d/qglinfo.desktop @@ -0,0 +1,11 @@ +[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 new file mode 100644 index 00000000..5360e495 --- /dev/null +++ b/devices/n900/usr/share/applications/hildon/qt3d/qpainter.desktop @@ -0,0 +1,11 @@ +[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 new file mode 100644 index 00000000..fac05fa0 --- /dev/null +++ b/devices/n900/usr/share/applications/hildon/qt3d/shapes.desktop @@ -0,0 +1,11 @@ +[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 new file mode 100644 index 00000000..ecf78841 --- /dev/null +++ b/devices/n900/usr/share/applications/hildon/qt3d/stereo.desktop @@ -0,0 +1,11 @@ +[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 new file mode 100644 index 00000000..b9efa1f3 --- /dev/null +++ b/devices/n900/usr/share/applications/hildon/qt3d/stereophoto.desktop @@ -0,0 +1,11 @@ +[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 new file mode 100644 index 00000000..5bf6ba11 --- /dev/null +++ b/devices/n900/usr/share/applications/hildon/qt3d/teapot-shader.desktop @@ -0,0 +1,11 @@ +[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 new file mode 100644 index 00000000..2470ae21 --- /dev/null +++ b/devices/n900/usr/share/applications/hildon/qt3d/teapot.desktop @@ -0,0 +1,11 @@ +[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 new file mode 100644 index 00000000..04f84675 --- /dev/null +++ b/devices/n900/usr/share/applications/hildon/qt3d/teaservice.desktop @@ -0,0 +1,11 @@ +[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 Binary files differnew file mode 100644 index 00000000..3386950b --- /dev/null +++ b/devices/n900/usr/share/pixmaps/qml3d-logo.png diff --git a/devices/n900/usr/share/pixmaps/teapot-logo.png b/devices/n900/usr/share/pixmaps/teapot-logo.png Binary files differnew file mode 100644 index 00000000..3532b520 --- /dev/null +++ b/devices/n900/usr/share/pixmaps/teapot-logo.png diff --git a/devices/symbian/symbian.pro b/devices/symbian/symbian.pro new file mode 100644 index 00000000..84ce237d --- /dev/null +++ b/devices/symbian/symbian.pro @@ -0,0 +1,64 @@ +# Use subdirs template to suppress generation of unnecessary files +TEMPLATE = subdirs + +symbian { + load(data_caging_paths) + + SUBDIRS= + # WARNING: Changing TARGET name will break Symbian SISX upgrade functionality + # DO NOT TOUCH TARGET VARIABLE IF YOU ARE NOT SURE WHAT YOU ARE DOING + TARGET = "Qt3D$${QT_LIBINFIX}" + + + isEmpty(QT_LIBINFIX) { + # TODO: Use signed UID + TARGET.UID3 = 0xE001E61E + } else { + # Always use experimental UID for infixed configuration to avoid UID clash + TARGET.UID3 = 0xE001E61E + } + + qt3dlibraries.sources = Qt3D$${QT_LIBINFIX}.dll + qt3dlibraries.path = /sys/bin + DEPLOYMENT += qt3dlibraries + + contains(CONFIG, old_importer): { + qt3dsceneformats_plugins.sources = \ + qscene3ds$${QT_LIBINFIX}.dll \ + qsceneobj$${QT_LIBINFIX}.dll \ + qscenebezier$${QT_LIBINFIX}.dll + qt3dsceneformats_plugins.path = $$QT_PLUGINS_BASE_DIR/sceneformats + DEPLOYMENT += qt3dsceneformats_plugins + } else { + qt3dsceneformats_plugins.sources = \ + qsceneai$${QT_LIBINFIX}.dll \ + qscenebezier$${QT_LIBINFIX}.dll + qt3dsceneformats_plugins.path = $$QT_PLUGINS_BASE_DIR/sceneformats + DEPLOYMENT += qt3dsceneformats_plugins + } + + qt3dimageformats_plugins.sources = \ + qtga$${QT_LIBINFIX}.dll + qt3dimageformats_plugins.path = $$QT_PLUGINS_BASE_DIR/imageformats + DEPLOYMENT += qt3dimageformats_plugins + + contains(QT_CONFIG, declarative): { + qt3dquick.sources = Qt3DQuick$${QT_LIBINFIX}.dll + qt3dquick.path = /sys/bin + qt3dthreedImports.sources = \ + qthreedqmlplugin.dll \ + $$PWD/../../src/imports/threed/qmldir + qt3dthreedImports.path = $$QT_IMPORTS_BASE_DIR/Qt3D + qt3dshapesImports.sources = \ + qshapesqmlplugin.dll \ + $$PWD/../../src/imports/shapes/Cube.qml \ + $$PWD/../../src/imports/shapes/cube.obj \ + $$PWD/../../src/imports/shapes/Quad.qml \ + $$PWD/../../src/imports/shapes/quad.obj \ + $$PWD/../../src/imports/shapes/Teapot.qml \ + $$PWD/../../src/imports/shapes/teapot.bez \ + $$PWD/../../src/imports/shapes/qmldir + qt3dshapesImports.path = $$QT_IMPORTS_BASE_DIR/Qt3D/Shapes + DEPLOYMENT += qt3dquick qt3dthreedImports qt3dshapesImports + } +} |