From cfb863f6c3ae7406028b9e167a3115250fefbca3 Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Fri, 21 Nov 2014 15:01:47 +0100
Subject: qt5 compatibility

---
 src/main.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/main.cpp')

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));
-- 
cgit v1.3.1