summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Koskinen <janne.p.koskinen@digia.com>2010-05-11 08:11:39 (GMT)
committerJanne Koskinen <janne.p.koskinen@digia.com>2010-05-11 08:18:18 (GMT)
commit560aa609be8b3f4d05e3df050cfa4feb39d060f1 (patch)
tree5300b6a28ee9947c80731b70b183afe5eede3efb
parent71d4f71c41e8bdfeaf4620a6b174a3dcb6930d23 (diff)
downloadQt-560aa609be8b3f4d05e3df050cfa4feb39d060f1.zip
Qt-560aa609be8b3f4d05e3df050cfa4feb39d060f1.tar.gz
Qt-560aa609be8b3f4d05e3df050cfa4feb39d060f1.tar.bz2
Spectrum Analyzer demo Symbian fix
Fixes compilation and deployment issue when compiling the app from root directory. Reviewed-by: Gareth Stockwell
-rw-r--r--demos/spectrum/spectrum.pro22
1 files changed, 10 insertions, 12 deletions
diff --git a/demos/spectrum/spectrum.pro b/demos/spectrum/spectrum.pro
index 86a7583..04bbdee 100644
--- a/demos/spectrum/spectrum.pro
+++ b/demos/spectrum/spectrum.pro
@@ -1,3 +1,4 @@
+load(data_caging_paths)
include(spectrum.pri)
TEMPLATE = subdirs
@@ -21,19 +22,16 @@ symbian {
# UID for the SIS file
TARGET.UID3 = 0xA000E3FA
- epoc32_dir = $${EPOCROOT}epoc32
- release_dir = $${epoc32_dir}/release/$(PLATFORM)/$(TARGET)
-
- bin.sources = $${release_dir}/spectrum.exe
+ bin.sources = spectrum.exe
!contains(DEFINES, DISABLE_FFT) {
- bin.sources += $${release_dir}/fftreal.dll
+ bin.sources += fftreal.dll
}
- bin.path = !:/sys/bin
- rsc.sources = $${epoc32_dir}/data/z/resource/apps/spectrum.rsc
- rsc.path = !:/resource/apps
- mif.sources = $${epoc32_dir}/data/z/resource/apps/spectrum.mif
- mif.path = !:/resource/apps
- reg_rsc.sources = $${epoc32_dir}/data/z/private/10003a3f/import/apps/spectrum_reg.rsc
- reg_rsc.path = !:/private/10003a3f/import/apps
+ bin.path = /sys/bin
+ rsc.sources = $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/spectrum.rsc
+ rsc.path = $$APP_RESOURCE_DIR
+ mif.sources = $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/spectrum.mif
+ mif.path = $$APP_RESOURCE_DIR
+ reg_rsc.sources = $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/spectrum_reg.rsc
+ reg_rsc.path = $$REG_RESOURCE_IMPORT_DIR
DEPLOYMENT += bin rsc mif reg_rsc
}