diff options
| author | axis <qt-info@nokia.com> | 2010-06-24 13:14:21 +0200 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-06-24 13:14:21 +0200 |
| commit | 447f2b410335730cd172a76abce184bacae186d2 (patch) | |
| tree | 73d93ef871e99f03eedd69eeb0fa74228c1e33d3 /demos/spectrum | |
| parent | 5ce3b09f9b3c574fc4ab2ecc42f879e64df0e6a1 (diff) | |
| parent | 7ae5285132db6c435e91ab097f41097217d68a2c (diff) | |
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')
| -rw-r--r-- | demos/spectrum/3rdparty/fftreal/fftreal.pro | 2 | ||||
| -rw-r--r-- | demos/spectrum/app/app.pro | 2 | ||||
| -rw-r--r-- | demos/spectrum/spectrum.pro | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/demos/spectrum/3rdparty/fftreal/fftreal.pro b/demos/spectrum/3rdparty/fftreal/fftreal.pro index 8d9f46e9d8..6801b42bf5 100644 --- a/demos/spectrum/3rdparty/fftreal/fftreal.pro +++ b/demos/spectrum/3rdparty/fftreal/fftreal.pro @@ -29,7 +29,7 @@ DEFINES += FFTREAL_LIBRARY symbian { # Provide unique ID for the generated binary, required by Symbian OS - TARGET.UID3 = 0xA000E3FB + TARGET.UID3 = 0xA000E403 TARGET.CAPABILITY = UserEnvironment } else { macx { diff --git a/demos/spectrum/app/app.pro b/demos/spectrum/app/app.pro index c4b0943fd3..c15edf9a39 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 } diff --git a/demos/spectrum/spectrum.pro b/demos/spectrum/spectrum.pro index d5a07f7699..df14a7da42 100644 --- a/demos/spectrum/spectrum.pro +++ b/demos/spectrum/spectrum.pro @@ -19,7 +19,7 @@ symbian { include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) # UID for the SIS file - TARGET.UID3 = 0xA000E3FA + TARGET.UID3 = 0xA000E402 } sources.files = README.txt spectrum.pri spectrum.pro TODO.txt |