merged master

2018-10-26 10:22:03 -07:00
parent faf7225321 ef04b4b888
commit 0e8d8a83e0
11 changed files with 246 additions and 13 deletions
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -101,6 +101,8 @@ bool Settings::loadFromFile() {

 #ifdef Q_OS_LINUX
 	confLocation = QStandardPaths::locate(QStandardPaths::HomeLocation, ".zcash/zcash.conf");
+#elif defined(Q_OS_DARWIN)
+	confLocation = QStandardPaths::locate(QStandardPaths::HomeLocation, "/Library/Application Support/Zcash/zcash.conf");
 #else
 	confLocation = QStandardPaths::locate(QStandardPaths::AppDataLocation, "../../Zcash/zcash.conf");
 #endif