diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-19 13:31:25 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-19 13:31:25 (GMT) |
| commit | 78dcac759d500c1744751955623b1d0babcd37a4 (patch) | |
| tree | 59d7a2540c2fcffe0b274afbf85db9a1f53242f4 /demos/embedded/fluidlauncher/fluidlauncher.pro | |
| parent | f1c79b3c90c1e14d8bee0228e3e416fa5337cf6e (diff) | |
| parent | de0858687898f6e0e54cce3f986779c7aa1a350e (diff) | |
| download | Qt-78dcac759d500c1744751955623b1d0babcd37a4.zip Qt-78dcac759d500c1744751955623b1d0babcd37a4.tar.gz Qt-78dcac759d500c1744751955623b1d0babcd37a4.tar.bz2 | |
Merge remote branch 'origin/4.7' into HEAD
Conflicts:
src/corelib/tools/qlocale_symbian.cpp
Diffstat (limited to 'demos/embedded/fluidlauncher/fluidlauncher.pro')
| -rw-r--r-- | demos/embedded/fluidlauncher/fluidlauncher.pro | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.pro b/demos/embedded/fluidlauncher/fluidlauncher.pro index c6a105e..bb512d9 100644 --- a/demos/embedded/fluidlauncher/fluidlauncher.pro +++ b/demos/embedded/fluidlauncher/fluidlauncher.pro @@ -116,6 +116,10 @@ symbian { reg_resource.sources += $$regResourceDir(demos/qmediaplayer/qmediaplayer_reg.rsc) } + contains(QT_CONFIG, multimedia) { + reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/spectrum_reg.rsc + } + reg_resource.path = $$REG_RESOURCE_IMPORT_DIR @@ -196,6 +200,13 @@ symbian { $$appResourceDir(demos/qmediaplayer/qmediaplayer.mif) } + contains(QT_CONFIG, multimedia) { + executables.sources += spectrum.exe fftreal.dll + resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/spectrum.rsc + mifs.sources += \ + $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/spectrum.mif + } + contains(QT_CONFIG, script) { executables.sources += $$QT_BUILD_TREE/examples/script/context2d/context2d.exe reg_resource.sources += $$regResourceDir(examples/script/context2d/context2d_reg.rsc) |