diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-10-02 15:35:08 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-10-02 15:43:09 (GMT) |
| commit | d794c13945825d9110d73ea5142fe4f7f2cdf571 (patch) | |
| tree | 2fee3006ecd35e2bec173c72a243417279d0c989 | |
| parent | bd84223fff34578918a9ea1ba8c8d7d58edb0433 (diff) | |
| download | Qt-d794c13945825d9110d73ea5142fe4f7f2cdf571.zip Qt-d794c13945825d9110d73ea5142fe4f7f2cdf571.tar.gz Qt-d794c13945825d9110d73ea5142fe4f7f2cdf571.tar.bz2 | |
Adjust the location that we install into, and use the sound location.
Note that fluidlauncher, because of desktopservices, installs the same mp3
to the same location.
| -rw-r--r-- | demos/embedded/fluidlauncher/fluidlauncher.pro | 1 | ||||
| -rw-r--r-- | demos/mediaplayer/mediaplayer.cpp | 2 | ||||
| -rw-r--r-- | demos/mediaplayer/mediaplayer.pro | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.pro b/demos/embedded/fluidlauncher/fluidlauncher.pro index 408bf53..af01ee7 100644 --- a/demos/embedded/fluidlauncher/fluidlauncher.pro +++ b/demos/embedded/fluidlauncher/fluidlauncher.pro @@ -166,6 +166,7 @@ symbian { viewerimages.sources = $$PWD/../embeddedsvgviewer/shapes.svg viewerimages.path = /data/images/qt/demos/embeddedsvgviewer + # demos/mediaplayer make also use of these files. desktopservices_music.sources = \ $$PWD/../desktopservices/data/*.mp3 \ $$PWD/../desktopservices/data/*.wav diff --git a/demos/mediaplayer/mediaplayer.cpp b/demos/mediaplayer/mediaplayer.cpp index 472b7db..baac236 100644 --- a/demos/mediaplayer/mediaplayer.cpp +++ b/demos/mediaplayer/mediaplayer.cpp @@ -653,7 +653,7 @@ void MediaPlayer::setFile(const QString &fileName) void MediaPlayer::openFile() { QStringList fileNames = QFileDialog::getOpenFileNames(this, QString(), - QDesktopServices::storageLocation(QDesktopServices::MoviesLocation)); + QDesktopServices::storageLocation(QDesktopServices::MusicLocation)); m_MediaObject.clearQueue(); if (fileNames.size() > 0) { QString fileName = fileNames[0]; diff --git a/demos/mediaplayer/mediaplayer.pro b/demos/mediaplayer/mediaplayer.pro index 55e5aab..bf61aae 100644 --- a/demos/mediaplayer/mediaplayer.pro +++ b/demos/mediaplayer/mediaplayer.pro @@ -30,6 +30,7 @@ symbian { TARGET.UID3 = 0xA000C613 addFiles.sources = ../../tests/auto/mediaobject/media/sax.mp3 - addFiles.path = /data/qt/qmediaplayer + + addFiles.path = /data/sounds/ DEPLOYMENT += addFiles } |