Fixed compile; QDesktopServices -> QStandardPaths
authorRohan McGovern <rohan.mcgovern@nokia.com>
Mon, 24 Oct 2011 02:51:27 +0000 (12:51 +1000)
committerQt by Nokia <qt-info@nokia.com>
Mon, 24 Oct 2011 06:56:39 +0000 (08:56 +0200)
Broken by qtbase dfa24768a3243eda68d91f573050bf23f96da2dd.

Change-Id: Id5940e90ac4a0853a5bda99c9db95bc77d53dfe1
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
src/assistant/assistant/mainwindow.cpp

index 4759e4f..8a4f465 100644 (file)
 #include <QtCore/QDir>
 #include <QtCore/QPair>
 #include <QtCore/QResource>
+#include <QtCore/QStandardPaths>
 #include <QtCore/QTextStream>
 #include <QtCore/QTimer>
 
 #include <QtWidgets/QAction>
 #include <QtWidgets/QComboBox>
-#include <QtGui/QDesktopServices>
 #include <QtWidgets/QDesktopWidget>
 #include <QtWidgets/QDockWidget>
 #include <QtGui/QFontDatabase>
@@ -1015,7 +1015,7 @@ QString MainWindow::collectionFileDirectory(bool createDir, const QString &cache
 {
     TRACE_OBJ
     QString collectionPath =
-        QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+        QStandardPaths::writableLocation(QStandardPaths::DataLocation);
     if (collectionPath.isEmpty()) {
         if (cacheDir.isEmpty())
             collectionPath = QDir::homePath() + QDir::separator()