qt5 compatibility

1 files changed, 10 insertions, 3 deletions

diff --git a/src/main.cpp b/src/main.cpp
index a21f41e4..4dbf9ff9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -308,10 +308,17 @@ int main(int argc, char *argv[])
   QFile instanceFile(application.applicationDirPath() + "/INSTANCE");

   if (instanceFile.open(QIODevice::ReadOnly)) {

     instanceID = instanceFile.readAll().trimmed();

-  }

+  }  

 

-  QString dataPath = instanceID.isEmpty() ? application.applicationDirPath()

-                                          : QDir::fromNativeSeparators(QDesktopServices::storageLocation(QDesktopServices::DataLocation)) + "/" + instanceID;

+  QString dataPath =

+      instanceID.isEmpty() ? application.applicationDirPath()

+                           : QDir::fromNativeSeparators(

+#if QT_VERSION >= 0x050000

+                           QStandardPaths::writableLocation(QStandardPaths::DataLocation)

+#else

+                           QDesktopServices::storageLocation(QDesktopServices::DataLocation)

+#endif

+                             );

   application.setProperty("dataPath", dataPath);

 

   qDebug("data path: %s", qPrintable(dataPath));