diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-07-05 10:39:37 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-07-06 08:27:55 (GMT) |
| commit | 78f48dc47dd7ea52f2ad979a7fd5289da9f22e66 (patch) | |
| tree | 66fbe661d6c76b3e33a78c0fb762d3f3a2e8a8a2 | |
| parent | f36d829ef02c54b18734dd027a1c0d9b55a6171f (diff) | |
| download | Qt-78f48dc47dd7ea52f2ad979a7fd5289da9f22e66.zip Qt-78f48dc47dd7ea52f2ad979a7fd5289da9f22e66.tar.gz Qt-78f48dc47dd7ea52f2ad979a7fd5289da9f22e66.tar.bz2 | |
Spectrum demo: fixed installation
All binaries must be written into $$QT_BUILD_DIR/demos/spectrum in
order for them to be correctly installed.
Task-number: QTBUG-11572
Task-number: QTBUG-11756
Reviewed-by: Andy Shaw
| -rw-r--r-- | demos/spectrum/3rdparty/fftreal/fftreal.pro | 14 | ||||
| -rw-r--r-- | demos/spectrum/app/app.pro | 7 |
2 files changed, 11 insertions, 10 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 diff --git a/demos/spectrum/app/app.pro b/demos/spectrum/app/app.pro index 28fdab0..1b419db 100644 --- a/demos/spectrum/app/app.pro +++ b/demos/spectrum/app/app.pro @@ -63,8 +63,7 @@ symbian { LIBS += -F$${fftreal_dir} LIBS += -framework fftreal } else { - # Link to dynamic library which is written to ../bin - LIBS += -L../bin + LIBS += -L.. LIBS += -lfftreal } } @@ -85,7 +84,7 @@ symbian { !contains(DEFINES, DISABLE_FFT) { # Include FFTReal DLL in the SIS file - fftreal.sources = ../3rdparty/fftreal/fftreal.dll + fftreal.sources = ../fftreal.dll fftreal.path = !:/sys/bin DEPLOYMENT += fftreal } @@ -110,7 +109,7 @@ symbian { } } else { # Specify directory in which to create spectrum application - DESTDIR = ../bin + DESTDIR = .. unix: { # Provide relative path from application to fftreal library |