diff options
| author | axis <qt-info@nokia.com> | 2009-11-06 14:44:39 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-06 14:44:39 (GMT) |
| commit | daf5f511ee813fc4fffba64bed558d0413270388 (patch) | |
| tree | 37fefb6189943606d184d2159577f7f2ce67b5db /src/plugins | |
| parent | 89b6de9091adbf0645ffe2aba59cb17cb233c170 (diff) | |
| parent | ded84966823eac0ae0275a2a7676d647d4d856ff (diff) | |
| download | Qt-daf5f511ee813fc4fffba64bed558d0413270388.zip Qt-daf5f511ee813fc4fffba64bed558d0413270388.tar.gz Qt-daf5f511ee813fc4fffba64bed558d0413270388.tar.bz2 | |
Merge branch '4.6-s60' into 4.6
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/graphicssystems/openvg/openvg.pro | 2 | ||||
| -rw-r--r-- | src/plugins/phonon/mmf/plugin/plugin.pro | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/plugins/graphicssystems/openvg/openvg.pro b/src/plugins/graphicssystems/openvg/openvg.pro index d36570c..781cdc4 100644 --- a/src/plugins/graphicssystems/openvg/openvg.pro +++ b/src/plugins/graphicssystems/openvg/openvg.pro @@ -10,3 +10,5 @@ HEADERS = qgraphicssystem_vg_p.h target.path += $$[QT_INSTALL_PLUGINS]/graphicssystems INSTALLS += target + +symbian: TARGET.UID3 = 0x2001E62C diff --git a/src/plugins/phonon/mmf/plugin/plugin.pro b/src/plugins/phonon/mmf/plugin/plugin.pro index eb7fd27..8a7de98 100644 --- a/src/plugins/phonon/mmf/plugin/plugin.pro +++ b/src/plugins/phonon/mmf/plugin/plugin.pro @@ -26,6 +26,7 @@ HEADERS += \ $$PHONON_MMF_DIR/abstractaudioeffect.h \ $$PHONON_MMF_DIR/abstractmediaplayer.h \ $$PHONON_MMF_DIR/abstractplayer.h \ + $$PHONON_MMF_DIR/ancestormovemonitor.h \ $$PHONON_MMF_DIR/audiooutput.h \ $$PHONON_MMF_DIR/audioequalizer.h \ $$PHONON_MMF_DIR/audioplayer.h \ @@ -47,6 +48,7 @@ SOURCES += \ $$PHONON_MMF_DIR/abstractaudioeffect.cpp \ $$PHONON_MMF_DIR/abstractmediaplayer.cpp \ $$PHONON_MMF_DIR/abstractplayer.cpp \ + $$PHONON_MMF_DIR/ancestormovemonitor.cpp \ $$PHONON_MMF_DIR/audiooutput.cpp \ $$PHONON_MMF_DIR/audioequalizer.cpp \ $$PHONON_MMF_DIR/audioplayer.cpp \ @@ -67,11 +69,12 @@ debug { LIBS += -lhal } -LIBS += -lmediaclientvideo # For CVideoPlayerUtility -LIBS += -lcone # For CCoeEnv -LIBS += -lws32 # For RWindow -LIBS += -lefsrv # For file server -LIBS += -lapgrfx -lapmime # For recognizer +LIBS += -lmediaclientvideo # For CVideoPlayerUtility +LIBS += -lcone # For CCoeEnv +LIBS += -lws32 # For RWindow +LIBS += -lefsrv # For file server +LIBS += -lapgrfx -lapmime # For recognizer +LIBS += -lmmfcontrollerframework # For CMMFMetaDataEntry # These are for effects. LIBS += -lAudioEqualizerEffect -lBassBoostEffect -lDistanceAttenuationEffect -lDopplerBase -lEffectBase -lEnvironmentalReverbEffect -lListenerDopplerEffect -lListenerLocationEffect -lListenerOrientationEffect -lLocationBase -lLoudnessEffect -lOrientationBase -lSourceDopplerEffect -lSourceLocationEffect -lSourceOrientationEffect -lStereoWideningEffect |