diff options
author | axis <qt-info@nokia.com> | 2010-06-24 11:14:21 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2010-06-24 11:14:21 (GMT) |
commit | 447f2b410335730cd172a76abce184bacae186d2 (patch) | |
tree | 73d93ef871e99f03eedd69eeb0fa74228c1e33d3 /demos/spectrum/app/app.pro | |
parent | 5ce3b09f9b3c574fc4ab2ecc42f879e64df0e6a1 (diff) | |
parent | 7ae5285132db6c435e91ab097f41097217d68a2c (diff) | |
download | Qt-447f2b410335730cd172a76abce184bacae186d2.zip Qt-447f2b410335730cd172a76abce184bacae186d2.tar.gz Qt-447f2b410335730cd172a76abce184bacae186d2.tar.bz2 |
Merge branch '4.6-s60' into 4.7-s60
Conflicts:
src/3rdparty/phonon/qt7/mediaobject.mm
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/plugins/phonon/mmf/mmf.pro
Diffstat (limited to 'demos/spectrum/app/app.pro')
-rw-r--r-- | demos/spectrum/app/app.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/spectrum/app/app.pro b/demos/spectrum/app/app.pro index c4b0943..c15edf9 100644 --- a/demos/spectrum/app/app.pro +++ b/demos/spectrum/app/app.pro @@ -48,7 +48,7 @@ symbian { TARGET.CAPABILITY = UserEnvironment # Provide unique ID for the generated binary, required by Symbian OS - TARGET.UID3 = 0xA000E3FA + TARGET.UID3 = 0xA000E402 } |