summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@qt.io>2019-07-24 11:01:47 +0200
committerhjk <hjk@qt.io>2019-07-24 09:47:26 +0000
commit39aa3252452b005c9b36cd75326e8460383d14da (patch)
treee9a0d9980b7488c048377b4aacd73ddbc5c5b41c /src
parente8e17f6c52a8e5a565a4bf7209f6a6ca3acb7067 (diff)
downloadqt-creator-39aa3252452b005c9b36cd75326e8460383d14da.tar.gz
Fix compile after FileName drop
Amends 44acfc0702d0. Change-Id: I1bddb0642e181b0a02d4ecba7ff1ae282218338f Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/baremetal/iarewtoolchain.cpp2
-rw-r--r--src/plugins/clangformat/clangformatplugin.cpp2
-rw-r--r--src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/baremetal/iarewtoolchain.cpp b/src/plugins/baremetal/iarewtoolchain.cpp
index c4c03e7d7c..3235ee5393 100644
--- a/src/plugins/baremetal/iarewtoolchain.cpp
+++ b/src/plugins/baremetal/iarewtoolchain.cpp
@@ -433,7 +433,7 @@ QList<ToolChain *> IarToolChainFactory::autoDetect(const QList<ToolChain *> &alr
if (!compilerPath.isEmpty()) {
// Build full compiler path.
compilerPath += entry.subExePath;
- const FileName fn = FileName::fromString(compilerPath);
+ const FilePath fn = FilePath::fromString(compilerPath);
if (compilerExists(fn)) {
// Note: threeLevelKey is a guessed toolchain version.
candidates.push_back({fn, threeLevelKey});
diff --git a/src/plugins/clangformat/clangformatplugin.cpp b/src/plugins/clangformat/clangformatplugin.cpp
index 493f19c3e2..50775d1c15 100644
--- a/src/plugins/clangformat/clangformatplugin.cpp
+++ b/src/plugins/clangformat/clangformatplugin.cpp
@@ -135,7 +135,7 @@ bool ClangFormatPlugin::initialize(const QStringList &arguments, QString *errorS
const QString fileName = openClangFormatConfigAction->data().toString();
if (!fileName.isEmpty()) {
const QString clangFormatConfigPath = configForFile(
- Utils::FileName::fromString(fileName));
+ Utils::FilePath::fromString(fileName));
Core::EditorManager::openEditor(clangFormatConfigPath);
}
});
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
index ff08ee7918..4c4eb20a7e 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
@@ -430,7 +430,7 @@ Utils::FilePath CompilationDatabaseProject::rootPathFromSettings() const
#ifdef WITH_TESTS
return Utils::FilePath::fromString(projectDirectory().fileName());
#else
- return Utils::FileName::fromString(
+ return Utils::FilePath::fromString(
namedSettings(ProjectExplorer::Constants::PROJECT_ROOT_PATH_KEY).toString());
#endif
}