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

Qnx: Use more FilePath for paths

Browse Source 
Change-Id: I36f00548247cd34bbb52b452bc80978f131e5270
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
hjk
2021-09-27 14:25:26 +02:00
parent 7df00776d1
commit be4cfd9d07
9 changed files with 60 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qnx/qnxqtversion.cpp
View File

@@ -109,14 +109,14 @@ QString QnxQtVersion::cpuDir() const
QVariantMap QnxQtVersion::toMap() const
{
QVariantMap result = BaseQtVersion::toMap();
result.insert(QLatin1String(SDP_PATH_KEY), sdpPath());
result.insert(SDP_PATH_KEY, sdpPath().toVariant());
return result;
}
void QnxQtVersion::fromMap(const QVariantMap &map)
{
BaseQtVersion::fromMap(map);
setSdpPath(QDir::fromNativeSeparators(map.value(QLatin1String(SDP_PATH_KEY)).toString()));
setSdpPath(FilePath::fromVariant(map.value(SDP_PATH_KEY)));
}
Abis QnxQtVersion::detectQtAbis() const
@@ -134,7 +134,7 @@ void QnxQtVersion::addToEnvironment(const Kit *k, Environment &env) const
env.prependOrSetLibrarySearchPath(libraryPath().toString());
}
void QnxQtVersion::setupQmakeRunEnvironment(Utils::Environment &env) const
void QnxQtVersion::setupQmakeRunEnvironment(Environment &env) const
{
if (!sdpPath().isEmpty())
updateEnvironment();
@@ -160,12 +160,12 @@ QString QnxQtVersion::invalidReason() const
return QtSupport::BaseQtVersion::invalidReason();
}
QString QnxQtVersion::sdpPath() const
FilePath QnxQtVersion::sdpPath() const
{
return m_sdpPath;
}
void QnxQtVersion::setSdpPath(const QString &sdpPath)
void QnxQtVersion::setSdpPath(const FilePath &sdpPath)
{
if (m_sdpPath == sdpPath)
return;