# HG changeset patch # User Chris Cannam # Date 1556204151 -3600 # Node ID a9d0b5a2c2424342a0219194cc21c149375843aa # Parent 718ce5fb9fec8db4ccdac347c9a1bfd876b9365c Also look for helpers in Resources folder on the Mac diff -r 718ce5fb9fec -r a9d0b5a2c242 base/HelperExecPath.cpp --- a/base/HelperExecPath.cpp Thu Apr 25 11:30:51 2019 +0100 +++ b/base/HelperExecPath.cpp Thu Apr 25 15:55:51 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::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";