diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-06 10:47:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-06 10:47:12 (GMT) |
| commit | 1f6ca759736eaf8eee7df6bec657e9806602543b (patch) | |
| tree | 66fbe661d6c76b3e33a78c0fb762d3f3a2e8a8a2 /demos/spectrum/3rdparty/fftreal/fftreal.pro | |
| parent | 6f1b1f4e5eb6666ed25f770ded1a721b5d1e4907 (diff) | |
| parent | 78f48dc47dd7ea52f2ad979a7fd5289da9f22e66 (diff) | |
| download | Qt-1f6ca759736eaf8eee7df6bec657e9806602543b.zip Qt-1f6ca759736eaf8eee7df6bec657e9806602543b.tar.gz Qt-1f6ca759736eaf8eee7df6bec657e9806602543b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Spectrum demo: fixed installation
Spectrum build: fixed DLL rpath
Diffstat (limited to 'demos/spectrum/3rdparty/fftreal/fftreal.pro')
| -rw-r--r-- | demos/spectrum/3rdparty/fftreal/fftreal.pro | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/demos/spectrum/3rdparty/fftreal/fftreal.pro b/demos/spectrum/3rdparty/fftreal/fftreal.pro index 6801b42..c9da205 100644 --- a/demos/spectrum/3rdparty/fftreal/fftreal.pro +++ b/demos/spectrum/3rdparty/fftreal/fftreal.pro @@ -1,3 +1,5 @@ +include(../../spectrum.pri) + TEMPLATE = lib TARGET = fftreal @@ -31,13 +33,13 @@ symbian { # Provide unique ID for the generated binary, required by Symbian OS TARGET.UID3 = 0xA000E403 TARGET.CAPABILITY = UserEnvironment +} + +macx { + CONFIG += lib_bundle } else { - macx { - CONFIG += lib_bundle - } else { - DESTDIR = ../../bin - } -} + !symbian: DESTDIR = ../.. +} # Install |