summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@nokia.com>2011-12-31 15:27:11 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-02 08:39:26 +0100
commitffa440faa1348410df2f6b606199ebd97b839685 (patch)
treed63ae67183a69431e9bca5ebf1d5f3476068cce1
parent0f10ce17e75693da521c3a3aac459dfbcbbd62a3 (diff)
Remove dependency on QDesktopServices deprecated API.
QDesktopServices::storageLocation() is deprecated in favor of QStandardPaths::writableLocation(). Change-Id: I5c427d8f2a8d7cbffcca7938c184b07b0ba47ab5 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
-rw-r--r--examples/phonon/qmediaplayer/mediaplayer.cpp2
-rw-r--r--examples/phonon/qmusicplayer/mainwindow.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/phonon/qmediaplayer/mediaplayer.cpp b/examples/phonon/qmediaplayer/mediaplayer.cpp
index 23bf0e7..9e249e0 100644
--- a/examples/phonon/qmediaplayer/mediaplayer.cpp
+++ b/examples/phonon/qmediaplayer/mediaplayer.cpp
@@ -714,7 +714,7 @@ void MediaPlayer::openFile()
const bool hasPausedForDialog = playPauseForDialog();
QStringList fileNames = QFileDialog::getOpenFileNames(this, QString(),
- QDesktopServices::storageLocation(QDesktopServices::MusicLocation));
+ QStandardPaths::writableLocation(QStandardPaths::MusicLocation));
if (hasPausedForDialog)
m_MediaObject.play();
diff --git a/examples/phonon/qmusicplayer/mainwindow.cpp b/examples/phonon/qmusicplayer/mainwindow.cpp
index f6a41a3..18beafa 100644
--- a/examples/phonon/qmusicplayer/mainwindow.cpp
+++ b/examples/phonon/qmusicplayer/mainwindow.cpp
@@ -76,7 +76,7 @@ MainWindow::MainWindow()
void MainWindow::addFiles()
{
QStringList files = QFileDialog::getOpenFileNames(this, tr("Select Music Files"),
- QDesktopServices::storageLocation(QDesktopServices::MusicLocation));
+ QStandardPaths::writableLocation(QStandardPaths::MusicLocation));
if (files.isEmpty())
return;