feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Rename FilePath::deviceLocalPath() to nativePath()

Browse Source 
Change-Id: Id2b2b7d54a536d569c6dc717365ee28421e2b56b
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2021-11-10 16:19:25 +01:00
parent 40c04a4fe4
commit 3fd1122759
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/utils/environment.cpp
View File

@@ -57,7 +57,7 @@ void Environment::appendOrSetPath(const FilePath &value)
QTC_CHECK(value.osType() == m_osType);
if (value.isEmpty())
return;
appendOrSet("PATH", value.deviceLocalPath(),
appendOrSet("PATH", value.nativePath(),
QString(OsSpecificAspects::pathListSeparator(m_osType)));
}
@@ -66,7 +66,7 @@ void Environment::prependOrSetPath(const FilePath &value)
QTC_CHECK(value.osType() == m_osType);
if (value.isEmpty())
return;
prependOrSet("PATH", value.deviceLocalPath(),
prependOrSet("PATH", value.nativePath(),
QString(OsSpecificAspects::pathListSeparator(m_osType)));
}
@@ -104,12 +104,12 @@ void Environment::prependOrSetLibrarySearchPath(const FilePath &value)
switch (m_osType) {
case OsTypeWindows: {
const QChar sep = ';';
prependOrSet("PATH", value.deviceLocalPath(), QString(sep));
prependOrSet("PATH", value.nativePath(), QString(sep));
break;
}
case OsTypeMac: {
const QString sep = ":";
const QString nativeValue = value.deviceLocalPath();
const QString nativeValue = value.nativePath();
prependOrSet("DYLD_LIBRARY_PATH", nativeValue, sep);
prependOrSet("DYLD_FRAMEWORK_PATH", nativeValue, sep);
break;
@@ -117,7 +117,7 @@ void Environment::prependOrSetLibrarySearchPath(const FilePath &value)
case OsTypeLinux:
case OsTypeOtherUnix: {
const QChar sep = ':';
prependOrSet("LD_LIBRARY_PATH", value.deviceLocalPath(), QString(sep));
prependOrSet("LD_LIBRARY_PATH", value.nativePath(), QString(sep));
break;
}
default: