diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-10-02 18:05:53 +0200 |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-10-02 18:05:53 +0200 |
| commit | 0981f27d76436f8058d8534b7454777910922ee0 (patch) | |
| tree | 780a864cb0d9b163f15dbe9d84e64bb0dfbb9110 /demos/mediaplayer | |
| parent | e658bcb0e64acca9684f0897510d639af98ab552 (diff) | |
| parent | 5a26fa6da1986bdb507391fd8784c51258e81d80 (diff) | |
| download | qt4-tools-0981f27d76436f8058d8534b7454777910922ee0.tar.gz | |
Merge commit 'origin/4.6' into mmfphonon
Conflicts:
demos/mediaplayer/mediaplayer.pro
Diffstat (limited to 'demos/mediaplayer')
| -rw-r--r-- | demos/mediaplayer/mediaplayer.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/demos/mediaplayer/mediaplayer.pro b/demos/mediaplayer/mediaplayer.pro index bf61aaed2d..84293f2e55 100644 --- a/demos/mediaplayer/mediaplayer.pro +++ b/demos/mediaplayer/mediaplayer.pro @@ -26,11 +26,12 @@ DEPLOYMENT_PLUGIN += phonon_ds9 phonon_waveout } symbian { - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) TARGET.UID3 = 0xA000C613 addFiles.sources = ../../tests/auto/mediaobject/media/sax.mp3 addFiles.path = /data/sounds/ DEPLOYMENT += addFiles + + include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) } |