summaryrefslogtreecommitdiff
path: root/src/plugins/winrt
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-05-28 13:49:26 +0200
committerhjk <hjk@qt.io>2019-05-28 12:23:26 +0000
commit473a741c9fcf09febba312464fab8385e2351181 (patch)
tree2d328a090993cb5c5fd34b43e9468bcbf7e4d4d0 /src/plugins/winrt
parent4704f49fbb1201ebf10ab9dbaed0275ff25faba8 (diff)
downloadqt-creator-473a741c9fcf09febba312464fab8385e2351181.tar.gz
Utils: Rename FileName to FilePath
More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/winrt')
-rw-r--r--src/plugins/winrt/winrtpackagedeploymentstep.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/winrt/winrtpackagedeploymentstep.cpp b/src/plugins/winrt/winrtpackagedeploymentstep.cpp
index d9c6c260e4..357a306177 100644
--- a/src/plugins/winrt/winrtpackagedeploymentstep.cpp
+++ b/src/plugins/winrt/winrtpackagedeploymentstep.cpp
@@ -70,7 +70,7 @@ bool WinRtPackageDeploymentStep::init()
QTC_ASSERT(rc, return false);
const BuildTargetInfo bti = rc->buildTargetInfo();
- Utils::FileName appTargetFilePath = bti.targetFilePath;
+ Utils::FilePath appTargetFilePath = bti.targetFilePath;
m_targetFilePath = appTargetFilePath.toString();
if (m_targetFilePath.isEmpty()) {
@@ -107,7 +107,7 @@ bool WinRtPackageDeploymentStep::init()
QDir::toNativeSeparators(qt->binPath().toString())));
return false;
}
- params->setCommand(Utils::FileName::fromString(windeployqtPath));
+ params->setCommand(Utils::FilePath::fromString(windeployqtPath));
params->setArguments(args);
params->setEnvironment(buildConfiguration()->environment());
@@ -248,7 +248,7 @@ QString WinRtPackageDeploymentStep::defaultWinDeployQtArguments() const
void WinRtPackageDeploymentStep::raiseError(const QString &errorMessage)
{
- ProjectExplorer::Task task = Task(Task::Error, errorMessage, Utils::FileName(), -1,
+ ProjectExplorer::Task task = Task(Task::Error, errorMessage, Utils::FilePath(), -1,
ProjectExplorer::Constants::TASK_CATEGORY_DEPLOYMENT);
emit addTask(task, 1);
emit addOutput(errorMessage, BuildStep::OutputFormat::ErrorMessage);
@@ -256,7 +256,7 @@ void WinRtPackageDeploymentStep::raiseError(const QString &errorMessage)
void WinRtPackageDeploymentStep::raiseWarning(const QString &warningMessage)
{
- ProjectExplorer::Task task = Task(Task::Warning, warningMessage, Utils::FileName(), -1,
+ ProjectExplorer::Task task = Task(Task::Warning, warningMessage, Utils::FilePath(), -1,
ProjectExplorer::Constants::TASK_CATEGORY_DEPLOYMENT);
emit addTask(task, 1);
emit addOutput(warningMessage, BuildStep::OutputFormat::NormalMessage);