Merge pull request #4709 from jherico/resources

Removing debug hack to load resources from source folder
This commit is contained in:
samcake 2015-04-27 23:42:45 -07:00
commit 1acd27db08

View file

@ -19,19 +19,10 @@
QString& PathUtils::resourcesPath() {
#ifdef DEBUG
static QString staticResourcePath;
if (staticResourcePath.isEmpty()) {
QDir path(__FILE__);
path.cdUp();
staticResourcePath = path.cleanPath(path.absoluteFilePath("../../../interface/resources/")) + "/";
}
#else
#ifdef Q_OS_MAC
static QString staticResourcePath = QCoreApplication::applicationDirPath() + "/../Resources/";
#else
static QString staticResourcePath = QCoreApplication::applicationDirPath() + "/resources/";
#endif
#endif
return staticResourcePath;