diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-10-08 15:59:44 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-10-11 11:10:07 (GMT) |
| commit | 48f18622b6fbfd19ccc77574d3750a8c0c1f6a7d (patch) | |
| tree | 8df7154798e3d09e06be5f6c52501b513fbbd3f8 /demos/spectrum/app | |
| parent | 4809920df3c3329d47f595c1287ab44b454abb88 (diff) | |
| download | Qt-48f18622b6fbfd19ccc77574d3750a8c0c1f6a7d.zip Qt-48f18622b6fbfd19ccc77574d3750a8c0c1f6a7d.tar.gz Qt-48f18622b6fbfd19ccc77574d3750a8c0c1f6a7d.tar.bz2 | |
Spectrum demo: put binaries into correct locations on Windows
Task-number: QTBUG-13483
Reviewed-by: Miikka Heikkinen
Diffstat (limited to 'demos/spectrum/app')
| -rw-r--r-- | demos/spectrum/app/app.pro | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/demos/spectrum/app/app.pro b/demos/spectrum/app/app.pro index 4fe8b6d..57be114 100644 --- a/demos/spectrum/app/app.pro +++ b/demos/spectrum/app/app.pro @@ -65,7 +65,7 @@ symbian { LIBS += -F$${fftreal_dir} LIBS += -framework fftreal } else { - LIBS += -L.. + LIBS += -L..$${spectrum_build_dir} LIBS += -lfftreal } } @@ -91,10 +91,8 @@ symbian { DEPLOYMENT += fftreal } } else { + DESTDIR = ..$${spectrum_build_dir} macx { - # Specify directory in which to create spectrum.app bundle - DESTDIR = .. - !contains(DEFINES, DISABLE_FFT) { # Relocate fftreal.framework into spectrum.app bundle framework_dir = ../spectrum.app/Contents/Frameworks @@ -110,9 +108,6 @@ symbian { ../spectrum.app/Contents/MacOS/spectrum } } else { - # Specify directory in which to create spectrum application - DESTDIR = .. - unix: { # Provide relative path from application to fftreal library QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN |