summaryrefslogtreecommitdiffstats
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:35:28 (GMT)
commite7f6c2d9625bda1d063b9ec3acd7eb5f79f30ba7 (patch)
treebb3aa26fd89110ab6b6b90024f0923a4283ef7fb
parent919dc2dca2ceff3848f6c91819845819f91fb68e (diff)
downloadQt-e7f6c2d9625bda1d063b9ec3acd7eb5f79f30ba7.zip
Qt-e7f6c2d9625bda1d063b9ec3acd7eb5f79f30ba7.tar.gz
Qt-e7f6c2d9625bda1d063b9ec3acd7eb5f79f30ba7.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.pro14
-rw-r--r--demos/spectrum/app/app.pro5
2 files changed, 10 insertions, 9 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 5410b2b..6c74b27 100644
--- a/demos/spectrum/app/app.pro
+++ b/demos/spectrum/app/app.pro
@@ -62,8 +62,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
}
}
@@ -109,7 +108,7 @@ symbian {
}
} else {
# Specify directory in which to create spectrum application
- DESTDIR = ../bin
+ DESTDIR = ..
unix: {
# Provide relative path from application to fftreal library