Make Quasel compile on mac and win again.

[quassel.git] / src / common / quassel.cpp

diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index 52be52b..d9e180e 100644 (file)
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -241,16 +241,21 @@ QString Quassel::configDirPath() {
     _configDirPath = Quassel::optionValue("configdir");
   } else {
 
-    // We abuse QSettings to find us a sensible path on all platforms
-#ifdef Q_WS_WIN
+#ifdef Q_WS_MAC
+    // On Mac, the path is always the same
+    _configDirPath = QDir::homePath() + "/Library/Application Support/Quassel/";
+#else
+    // We abuse QSettings to find us a sensible path on the other platforms
+#  ifdef Q_WS_WIN
     // don't use the registry
     QSettings::Format format = QSettings::IniFormat;
-#else
+#  else
     QSettings::Format format = QSettings::NativeFormat;
-#endif
+#  endif
     QSettings s(format, QSettings::UserScope, QCoreApplication::organizationDomain(), buildInfo().applicationName);
     QFileInfo fileInfo(s.fileName());
     _configDirPath = fileInfo.dir().absolutePath();
+#endif /* Q_WS_MAC */
   }
 
   if(!_configDirPath.endsWith(QDir::separator()) && !_configDirPath.endsWith('/'))
@@ -281,7 +286,7 @@ QStringList Quassel::findDataDirPaths() const {
   // Provide a fallback
   // FIXME fix this for win and mac!
 #ifdef Q_OS_WIN32
-    dataDirNames << qgetenv("APPDATA") + QCoreApplication::organizationDomain();
+    dataDirNames << qgetenv("APPDATA") + QCoreApplication::organizationDomain()
                  << QCoreApplication::applicationDirPath();
 #elif defined Q_WS_MAC
     dataDirNames << QDir::homePath() + "/Library/Application Support/Quassel/"