Commit 8eb63d83 authored by Tobias Hunger's avatar Tobias Hunger Committed by Tim Jenssen

qmake: Use Utils::FileName for QmakeProFile::subProjectsToDeploy

Change-Id: Iaa87f8049998939c883867aa13d9d347c19c33f9
Reviewed-by: Tim Jenssen's avatarTim Jenssen <tim.jenssen@qt.io>
parent 9e63c714
......@@ -1696,7 +1696,9 @@ void QmakeProFile::applyEvaluate(QmakeEvalResult *evalResult)
// update TargetInformation
m_qmakeTargetInformation = result->targetInformation;
m_subProjectsNotToDeploy = result->subProjectsNotToDeploy;
m_subProjectsNotToDeploy
= Utils::transform(result->subProjectsNotToDeploy,
[](const QString &s) { return FileName::fromString(s); });
m_installsList = result->installsList;
if (m_varValues != result->newVarValues)
......
......@@ -276,7 +276,7 @@ public:
QStringList variableValue(const Variable var) const;
QString singleVariableValue(const Variable var) const;
bool isSubProjectDeployable(const QString &filePath) const {
bool isSubProjectDeployable(const Utils::FileName &filePath) const {
return !m_subProjectsNotToDeploy.contains(filePath);
}
......@@ -349,7 +349,7 @@ private:
QList<ProjectExplorer::ExtraCompiler *> m_extraCompilers;
TargetParserInformation m_qmakeTargetInformation;
QStringList m_subProjectsNotToDeploy;
Utils::FileNameList m_subProjectsNotToDeploy;
InstallsParserList m_installsList;
// Async stuff
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment