diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-21 19:33:16 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-21 19:33:16 (GMT) |
| commit | 54b3c2bb7909cf195d81eeebf2be66d2685bb20d (patch) | |
| tree | 4ddc999cdabb65be3d816d4b54a4d12af143d3d0 | |
| parent | 191df7e5575cb5b8d56846d82d405a8f0dd07fa9 (diff) | |
| parent | 77bc5d5bb6821d8ddc1d6b4b58a1acb2e7254006 (diff) | |
| download | Qt-54b3c2bb7909cf195d81eeebf2be66d2685bb20d.zip Qt-54b3c2bb7909cf195d81eeebf2be66d2685bb20d.tar.gz Qt-54b3c2bb7909cf195d81eeebf2be66d2685bb20d.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Removed DEPLOYMENT from demos/spectrum/spectrum.pro
Install source for spectrum demo
Fixed path for copying launcher script for spectrum demo
| -rw-r--r-- | demos/spectrum/3rdparty/fftreal/fftreal.pro | 6 | ||||
| -rw-r--r-- | demos/spectrum/app/app.pro | 9 | ||||
| -rw-r--r-- | demos/spectrum/spectrum.pro | 18 |
3 files changed, 19 insertions, 14 deletions
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 2adb605..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 @@ -111,7 +118,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 } diff --git a/demos/spectrum/spectrum.pro b/demos/spectrum/spectrum.pro index 04bbdee..8736ba7 100644 --- a/demos/spectrum/spectrum.pro +++ b/demos/spectrum/spectrum.pro @@ -21,17 +21,9 @@ 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 +sources.path = $$[QT_INSTALL_DEMOS]/spectrum +INSTALLS += sources + |