From b27e076b177c68e7e23296e1fe784b2657a1b88c Mon Sep 17 00:00:00 2001 From: Aditya Kulkarni Date: Tue, 13 Nov 2018 22:15:11 -0800 Subject: [PATCH] Enable embedded zcashd on mac --- src/connection.cpp | 6 +++--- src/main.cpp | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/connection.cpp b/src/connection.cpp index a7000d9..6a4d696 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -388,7 +388,7 @@ QString ConnectionLoader::locateZcashConfFile() { #ifdef Q_OS_LINUX auto confLocation = QStandardPaths::locate(QStandardPaths::HomeLocation, ".zcash/zcash.conf"); #elif defined(Q_OS_DARWIN) - auto confLocation = QStandardPaths::locate(QStandardPaths::HomeLocation, "/Library/Application Support/Zcash/zcash.conf"); + auto confLocation = QStandardPaths::locate(QStandardPaths::HomeLocation, "Library/Application Support/Zcash/zcash.conf"); #else auto confLocation = QStandardPaths::locate(QStandardPaths::AppDataLocation, "../../Zcash/zcash.conf"); #endif @@ -399,7 +399,7 @@ QString ConnectionLoader::zcashConfWritableLocation() { #ifdef Q_OS_LINUX auto confLocation = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath(".zcash/zcash.conf"); #elif defined(Q_OS_DARWIN) - auto confLocation = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath("/Library/Application Support/Zcash/zcash.conf"); + auto confLocation = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath("Library/Application Support/Zcash/zcash.conf"); #else auto confLocation = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("../../Zcash/zcash.conf"); #endif @@ -411,7 +411,7 @@ QString ConnectionLoader::zcashParamsDir() { #ifdef Q_OS_LINUX auto paramsLocation = QDir(QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath(".zcash-params")); #elif defined(Q_OS_DARWIN) - auto paramsLocation = QDir(QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath("/Library/Application Support/ZcashParams")); + auto paramsLocation = QDir(QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath("Library/Application Support/ZcashParams")); #else auto paramsLocation = QDir(QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("../../ZcashParams")); #endif diff --git a/src/main.cpp b/src/main.cpp index b8b7b0a..76fcd14 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -28,11 +28,6 @@ int main(int argc, char *argv[]) Settings::getInstance()->setUseEmbedded(true); } - // No embedded support on Mac yet. -#if defined(Q_OS_DARWIN) - Settings::getInstance()->setUseEmbedded(false); -#endif - QCoreApplication::setOrganizationName("zec-qt-wallet-org"); QCoreApplication::setApplicationName("zec-qt-wallet");