diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-26 13:18:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-26 13:18:47 (GMT) |
| commit | 40a1ced340f53d2ae44364a3802529bc71b70ae3 (patch) | |
| tree | 434e24f5714194a39c3abfbd19a6b16d9d43a06e | |
| parent | 9dcc2de14862da0bba6b74c51ac6e7a5193d4f08 (diff) | |
| parent | 80dcdd160e5468e38558d2df570df38235b18e71 (diff) | |
| download | Qt-40a1ced340f53d2ae44364a3802529bc71b70ae3.zip Qt-40a1ced340f53d2ae44364a3802529bc71b70ae3.tar.gz Qt-40a1ced340f53d2ae44364a3802529bc71b70ae3.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Removed unnecessary PlatSec capabilities from spectrum demo DLL
Added missing PlatSec capabilities to spectrum demo DLL
| -rw-r--r-- | demos/spectrum/3rdparty/fftreal/fftreal.pro | 1 | ||||
| -rw-r--r-- | demos/spectrum/app/app.pro | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/demos/spectrum/3rdparty/fftreal/fftreal.pro b/demos/spectrum/3rdparty/fftreal/fftreal.pro index 5dd02a4..8d9f46e 100644 --- a/demos/spectrum/3rdparty/fftreal/fftreal.pro +++ b/demos/spectrum/3rdparty/fftreal/fftreal.pro @@ -30,6 +30,7 @@ DEFINES += FFTREAL_LIBRARY symbian { # Provide unique ID for the generated binary, required by Symbian OS TARGET.UID3 = 0xA000E3FB + TARGET.CAPABILITY = UserEnvironment } else { macx { CONFIG += lib_bundle diff --git a/demos/spectrum/app/app.pro b/demos/spectrum/app/app.pro index 92398ac..db9a144 100644 --- a/demos/spectrum/app/app.pro +++ b/demos/spectrum/app/app.pro @@ -45,7 +45,7 @@ RESOURCES = spectrum.qrc symbian { # Platform security capability required to record audio on Symbian - TARGET.CAPABILITY += UserEnvironment + TARGET.CAPABILITY = UserEnvironment # Provide unique ID for the generated binary, required by Symbian OS TARGET.UID3 = 0xA000E3FA |