X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Futil.cpp;h=f0a7a749e060adca231d0e901a4bfdb2dd2d4e81;hb=92789e6323ca73383a7954d834ecfc093234f5e2;hp=9bd17d9488083a6d3d45f668af0b4eebfe638c62;hpb=665faa937a52fc6175741292737c4a52875b4f75;p=quassel.git

diff --git a/src/common/util.cpp b/src/common/util.cpp
index 9bd17d94..f0a7a749 100644
--- a/src/common/util.cpp
+++ b/src/common/util.cpp
@@ -19,6 +19,7 @@
  ***************************************************************************/
 
 #include "util.h"
+#include "global.h"
 
 #include <QCoreApplication>
 #include <QDebug>
@@ -142,12 +143,18 @@ QByteArray methodName(const QMetaMethod &method) {
 }
 
 QDir quasselDir() {
-  // kinda ugly, but I currently see no other way to do that
+  QString quasselDir;
+  if(Global::parser.isSet("datadir")) {
+    quasselDir = Global::parser.value("datadir");
+  } else {
 #ifdef Q_OS_WIN32
-  QString quasselDir = qgetenv("APPDATA") + "/quassel/";
+    quasselDir = qgetenv("APPDATA") + "/quassel/";
+#elif defined Q_WS_MAC
+    quasselDir = QDir::homePath() + "/Library/Application Support/Quassel/";
 #else
-  QString quasselDir = QDir::homePath() + "/.quassel/";
+    quasselDir = QDir::homePath() + "/.quassel/";
 #endif
+  }
 
   QDir qDir(quasselDir);
   if(!qDir.exists(quasselDir)) {