summaryrefslogtreecommitdiffstats
path: root/demos/spectrum/3rdparty
diff options
context:
space:
mode:
authorGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-07-05 10:39:37 (GMT)
committerGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-07-06 08:27:55 (GMT)
commit78f48dc47dd7ea52f2ad979a7fd5289da9f22e66 (patch)
tree66fbe661d6c76b3e33a78c0fb762d3f3a2e8a8a2 /demos/spectrum/3rdparty
parentf36d829ef02c54b18734dd027a1c0d9b55a6171f (diff)
downloadQt-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
Diffstat (limited to 'demos/spectrum/3rdparty')
-rw-r--r--demos/spectrum/3rdparty/fftreal/fftreal.pro14
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