From 30d6b4ba5626fca244af6314f1b99e6d3854fe58 Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Thu, 20 May 2010 13:52:38 +0200 Subject: Fixed path for copying launcher script for spectrum demo Task-number: QTBUG-10879 Reviewed-by: Thomas Zander --- demos/spectrum/app/app.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/spectrum/app/app.pro b/demos/spectrum/app/app.pro index 2adb605..ce29169 100644 --- a/demos/spectrum/app/app.pro +++ b/demos/spectrum/app/app.pro @@ -111,7 +111,7 @@ symbian { # the dynamic library can be located. copy_launch_script.target = copy_launch_script copy_launch_script.commands = \ - install -m 0555 spectrum.sh ../bin/spectrum + install -m 0555 $$QT_SOURCE_TREE/demos/spectrum/app/spectrum.sh ../bin/spectrum QMAKE_EXTRA_TARGETS += copy_launch_script POST_TARGETDEPS += copy_launch_script } -- cgit v0.12 From 00fba5fb07a0a6c3c31772e60856c982010629a1 Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Thu, 20 May 2010 13:53:45 +0200 Subject: Install source for spectrum demo Task-number: QTBUG-10880 Reviewed-by: Thomas Zander --- demos/spectrum/3rdparty/fftreal/fftreal.pro | 6 ++++++ demos/spectrum/app/app.pro | 7 +++++++ demos/spectrum/spectrum.pro | 5 +++++ 3 files changed, 18 insertions(+) diff --git a/demos/spectrum/3rdparty/fftreal/fftreal.pro b/demos/spectrum/3rdparty/fftreal/fftreal.pro index 4ab9652..5dd02a4 100644 --- a/demos/spectrum/3rdparty/fftreal/fftreal.pro +++ b/demos/spectrum/3rdparty/fftreal/fftreal.pro @@ -38,4 +38,10 @@ symbian { } } +# Install + +sources.files = $$SOURCES $$HEADERS fftreal.pro readme.txt license.txt +sources.files += bwins/fftreal.def eabi/fftreal.def +sources.path = $$[QT_INSTALL_DEMOS]/spectrum/3rdparty/fftreal +INSTALLS += sources diff --git a/demos/spectrum/app/app.pro b/demos/spectrum/app/app.pro index ce29169..92398ac 100644 --- a/demos/spectrum/app/app.pro +++ b/demos/spectrum/app/app.pro @@ -70,6 +70,13 @@ symbian { } } +# Install + +sources.files = $$SOURCES $$HEADERS $$RESOURCES app.pro +sources.path = $$[QT_INSTALL_DEMOS]/spectrum/app +images.files += images/record.png images/settings.png +images.path = $$[QT_INSTALL_DEMOS]/spectrum/app/images +INSTALLS += sources images # Deployment diff --git a/demos/spectrum/spectrum.pro b/demos/spectrum/spectrum.pro index 04bbdee..bf73032 100644 --- a/demos/spectrum/spectrum.pro +++ b/demos/spectrum/spectrum.pro @@ -35,3 +35,8 @@ symbian { reg_rsc.path = $$REG_RESOURCE_IMPORT_DIR DEPLOYMENT += bin rsc mif reg_rsc } + +sources.files = README.txt spectrum.pri spectrum.pro TODO.txt +sources.path = $$[QT_INSTALL_DEMOS]/spectrum +INSTALLS += sources + -- cgit v0.12 From 77bc5d5bb6821d8ddc1d6b4b58a1acb2e7254006 Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Fri, 21 May 2010 11:41:36 +0100 Subject: Removed DEPLOYMENT from demos/spectrum/spectrum.pro DEPLOYMENT was added to demos/spectrum/spectrum.pro as a workaround for QTBUG-5312, in order to allow 'make sis' to be executed from the demos/spectrum directory. While this workaround is OK for SBSv2, it causes a build failure when using SBSv1. Task-number: QTBUG-10833 --- demos/spectrum/spectrum.pro | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/demos/spectrum/spectrum.pro b/demos/spectrum/spectrum.pro index bf73032..8736ba7 100644 --- a/demos/spectrum/spectrum.pro +++ b/demos/spectrum/spectrum.pro @@ -21,19 +21,6 @@ symbian { # UID for the SIS file TARGET.UID3 = 0xA000E3FA - - bin.sources = spectrum.exe - !contains(DEFINES, DISABLE_FFT) { - bin.sources += fftreal.dll - } - 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 } sources.files = README.txt spectrum.pri spectrum.pro TODO.txt -- cgit v0.12