From 71530f253d87f1164550044b4ef1be974dfc4454 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Fri, 31 Jul 2015 10:41:16 +0200 Subject: [PATCH] Fixes #2549 - Use PrefixPath to find the simulator libs --- companion/src/simulation/simulatorinterface.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/companion/src/simulation/simulatorinterface.cpp b/companion/src/simulation/simulatorinterface.cpp index afcb52ef9..24e292ffb 100644 --- a/companion/src/simulation/simulatorinterface.cpp +++ b/companion/src/simulation/simulatorinterface.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #include #include #include "version.h" @@ -46,9 +47,14 @@ void registerSimulators() simulatorsFound = true; } -#if !( (!defined __GNUC__) || (defined __CYGWIN__) ) +#if defined(__APPLE__) || !( (!defined __GNUC__) || (defined __CYGWIN__) ) if (!simulatorsFound) { +#if defined(__APPLE__) + qDebug() << "QLibraryInfo::PrefixPath: " << QLibraryInfo::location(QLibraryInfo::PrefixPath); + dir = QLibraryInfo::location(QLibraryInfo::PrefixPath) + "/Resources"; +#else dir = SIMULATOR_LIB_SEARCH_PATH; +#endif foreach(QString filename, dir.entryList(filters, QDir::Files)) { registerSimulator(filename.prepend(dir.path() + "/")); simulatorsFound = true;