Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-22 13:29:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

expandToLocalDataAbsolutePath now expands to a file:// url rather than a qrc:// url

Browse source
This commit is contained in:
Seth Alves 2018-03-19 13:48:31 -07:00
parent af42b5e93f
commit a623ba7499
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libraries/shared/src/PathUtils.cpp
View file

@ -122,9 +122,27 @@ QUrl PathUtils::resourcesUrl(const QString& relativeUrl) {
QUrl PathUtils::expandToLocalDataAbsolutePath(const QUrl& fileUrl) { QUrl PathUtils::expandToLocalDataAbsolutePath(const QUrl& fileUrl) {
QString path = fileUrl.path(); QString path = fileUrl.path();
if (path.startsWith("/~/")) { if (path.startsWith("/~/")) {
return resourcesUrl(path.mid(3)); // this results in a qrc:// url...
// return resourcesUrl(path.mid(3));
// find Resources/ directory relative to executable path, but don't convert to qrc:// url
#if defined(Q_OS_OSX)
char buffer[8192];
uint32_t bufferSize = sizeof(buffer);
_NSGetExecutablePath(buffer, &bufferSize);
QString resourcesDir = QDir::cleanPath(QFileInfo(buffer).dir().absoluteFilePath("../Resources")) + "/";
#else
QString resourcesDir = projectRootPath() + "/interface/resources/";
#endif
path.replace(0, 3, resourcesDir);
QUrl expandedURL = QUrl::fromLocalFile(path);
return expandedURL;
} }
QUrl::fromLocalFile(resourcesPath()).toString();
return fileUrl; return fileUrl;
} }