aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/projectimporter.cpp
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2016-11-16 11:20:04 +0100
committerTobias Hunger <tobias.hunger@qt.io>2016-11-16 13:36:29 +0000
commit6e17882bfc1c0ea5cc3f9e09ef8739b20153943e (patch)
tree89e7cbe8a5dd35c8d937be59ef51ffd4461a6efa /src/plugins/projectexplorer/projectimporter.cpp
parent028b1170c93f55ad536f12a3cbfa1715c2124619 (diff)
ProjectExplorer: Use Utils::FileName in ProjectImporter API
Change-Id: I60e05f1bd892b508db90bc48837e29e2725bf333 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/projectimporter.cpp')
-rw-r--r--src/plugins/projectexplorer/projectimporter.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/projectexplorer/projectimporter.cpp b/src/plugins/projectexplorer/projectimporter.cpp
index a5d484c1bc2..563510da8b6 100644
--- a/src/plugins/projectexplorer/projectimporter.cpp
+++ b/src/plugins/projectexplorer/projectimporter.cpp
@@ -69,7 +69,7 @@ static bool hasOtherUsers(Core::Id id, const QVariant &v, Kit *k)
});
}
-ProjectImporter::ProjectImporter(const QString &path) : m_projectPath(path)
+ProjectImporter::ProjectImporter(const Utils::FileName &path) : m_projectPath(path)
{ }
ProjectImporter::~ProjectImporter()
@@ -139,7 +139,7 @@ QList<BuildInfo *> ProjectImporter::import(const Utils::FileName &importPath, bo
QMessageBox::critical(Core::ICore::mainWindow(),
QCoreApplication::translate("ProjectExplorer::ProjectImporter", "No Build Found"),
QCoreApplication::translate("ProjectExplorer::ProjectImporter", "No build found in %1 matching project %2.")
- .arg(importPath.toUserOutput()).arg(QDir::toNativeSeparators(projectFilePath())));
+ .arg(importPath.toUserOutput()).arg(projectFilePath().toUserOutput()));
return result;
}
@@ -247,7 +247,7 @@ void ProjectImporter::addProject(Kit *k) const
UpdateGuard guard(*this);
QStringList projects = k->value(TEMPORARY_OF_PROJECTS, QStringList()).toStringList();
- projects.append(m_projectPath); // note: There can be more than one instance of the project added!
+ projects.append(m_projectPath.toString()); // note: There can be more than one instance of the project added!
k->setValueSilently(TEMPORARY_OF_PROJECTS, projects);
}
@@ -258,7 +258,7 @@ void ProjectImporter::removeProject(Kit *k) const
UpdateGuard guard(*this);
QStringList projects = k->value(TEMPORARY_OF_PROJECTS, QStringList()).toStringList();
- projects.removeOne(m_projectPath);
+ projects.removeOne(m_projectPath.toString());
if (projects.isEmpty()) {
cleanupKit(k);