diff options
| author | Sarah Smith <sarah.j.smith@nokia.com> | 2011-05-11 17:17:29 +1000 |
|---|---|---|
| committer | Sarah Smith <sarah.j.smith@nokia.com> | 2011-05-11 17:17:29 +1000 |
| commit | 4d26bcf8b606ea4da1c38b506119269898986f6b (patch) | |
| tree | 564150df7428cc90194e16bf542052dfe257219b /devices | |
| parent | 98a3397e8ec2993bad866fe4b84678ea2e1f6a51 (diff) | |
Add symbian uids.
Also a few other random fixups, and removing of legacy stuff from early
attempts at sybian integration.
Note that the examples do not get a UID - apparently its not mandatory
for the examples.
Change-Id: I4af7dbe5ef2ec8acb4eea042428887fbf8f5bfe3
Diffstat (limited to 'devices')
| -rw-r--r-- | devices/symbian/symbian.pro | 57 |
1 files changed, 30 insertions, 27 deletions
diff --git a/devices/symbian/symbian.pro b/devices/symbian/symbian.pro index 84ce237d8..6ea2b580f 100644 --- a/devices/symbian/symbian.pro +++ b/devices/symbian/symbian.pro @@ -7,16 +7,21 @@ symbian { 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}" + TARGET = "Qt Quick 3D" + # This is the UID for the overall .SIS file package + TARGET.UID3 = 0x20031E9A - 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 - } + VERSION = 1.0.0 + + vendorinfo = \ + "; Localised Vendor name" \ + "%{\"Nokia\"}" \ + " " \ + "; Unique Vendor name" \ + ":\"Nokia\"" \ + " " + qt3dlibraries.pkg_prerules += vendorinfo qt3dlibraries.sources = Qt3D$${QT_LIBINFIX}.dll qt3dlibraries.path = /sys/bin @@ -42,23 +47,21 @@ symbian { 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 - } + 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 } |