diff base/HelperExecPath.cpp @ 1713:978c143c767f

Merge from branch single-point

--- a/base/HelperExecPath.cpp	Thu May 16 12:54:58 2019 +0100
+++ b/base/HelperExecPath.cpp	Fri May 17 10:02:43 2019 +0100
@@ -58,9 +58,17 @@
 QStringList
 HelperExecPath::getHelperDirPaths()
 {
+    // Helpers are expected to exist either in the same directory as
+    // this executable was found, or in either a subdirectory called
+    // helpers, or on the Mac only, a sibling called Resources.
+
     QStringList dirs;
     QString myDir = QCoreApplication::applicationDirPath();
+#ifdef Q_OS_MAC
+    dirs.push_back(myDir + "/../Resources");
+#else
     dirs.push_back(myDir + "/helpers");
+#endif
     dirs.push_back(myDir);
     return dirs;
 }
@@ -76,9 +84,6 @@
 QList<HelperExecPath::HelperExec>
 HelperExecPath::search(QString basename, QStringList &candidates)
 {
-    // Helpers are expected to exist either in the same directory as
-    // this executable was found, or in a subdirectory called helpers.
-
     QString extension = "";
 #ifdef _WIN32
     extension = ".exe";