diff options
| author | hjk <hjk@qt.io> | 2021-08-16 09:43:03 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2021-08-19 04:29:25 +0000 |
| commit | 0416e156120be942935ead91ff5040f806ef5a78 (patch) | |
| tree | d9bd1ad68bf42d7f52816817bba66621c609a119 /src/plugins/incredibuild | |
| parent | 906348ed50510ac197822a90099ff9275d35ace6 (diff) | |
Utils: Return FilePath from PathChooser::homePath()
Change-Id: Ib67435cb828e6bb55f76bfd6eb13165f46922c00
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/incredibuild')
| -rw-r--r-- | src/plugins/incredibuild/buildconsolebuildstep.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/incredibuild/commandbuilderaspect.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/incredibuild/buildconsolebuildstep.cpp b/src/plugins/incredibuild/buildconsolebuildstep.cpp index 15948dfb8a..9fcb058bd7 100644 --- a/src/plugins/incredibuild/buildconsolebuildstep.cpp +++ b/src/plugins/incredibuild/buildconsolebuildstep.cpp @@ -128,7 +128,7 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id profileXml->setLabelText(tr("Profile.xml:")); profileXml->setDisplayStyle(StringAspect::PathChooserDisplay); profileXml->setExpectedKind(PathChooser::Kind::File); - profileXml->setBaseFileName(FilePath::fromString(PathChooser::homePath())); + profileXml->setBaseFileName(PathChooser::homePath()); profileXml->setHistoryCompleter("IncrediBuild.BuildConsole.ProfileXml.History"); profileXml->setToolTip(tr("Defines how Automatic " "Interception Interface should handle the various processes " @@ -190,7 +190,7 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id monFile->setLabelText(tr("Save IncrediBuild monitor file:")); monFile->setDisplayStyle(StringAspect::PathChooserDisplay); monFile->setExpectedKind(PathChooser::Kind::Any); - monFile->setBaseFileName(FilePath::fromString(PathChooser::homePath())); + monFile->setBaseFileName(PathChooser::homePath()); monFile->setHistoryCompleter(QLatin1String("IncrediBuild.BuildConsole.MonFile.History")); monFile->setToolTip(tr("Writes a copy of the build progress file (.ib_mon) to the specified " "location. If only a folder name is given, a generated GUID will serve " @@ -207,7 +207,7 @@ BuildConsoleBuildStep::BuildConsoleBuildStep(BuildStepList *buildStepList, Id id logFile->setLabelText(tr("Output Log file:")); logFile->setDisplayStyle(StringAspect::PathChooserDisplay); logFile->setExpectedKind(PathChooser::Kind::SaveFile); - logFile->setBaseFileName(FilePath::fromString(PathChooser::homePath())); + logFile->setBaseFileName(PathChooser::homePath()); logFile->setHistoryCompleter(QLatin1String("IncrediBuild.BuildConsole.LogFile.History")); logFile->setToolTip(tr("Writes build output to a file.")); diff --git a/src/plugins/incredibuild/commandbuilderaspect.cpp b/src/plugins/incredibuild/commandbuilderaspect.cpp index 52353791a4..82abefa633 100644 --- a/src/plugins/incredibuild/commandbuilderaspect.cpp +++ b/src/plugins/incredibuild/commandbuilderaspect.cpp @@ -150,7 +150,7 @@ void CommandBuilderAspect::addToLayout(LayoutBuilder &builder) if (!d->makePathChooser) { d->makePathChooser = new PathChooser; d->makePathChooser->setExpectedKind(PathChooser::Kind::ExistingCommand); - d->makePathChooser->setBaseDirectory(FilePath::fromString(PathChooser::homePath())); + d->makePathChooser->setBaseDirectory(PathChooser::homePath()); d->makePathChooser->setHistoryCompleter("IncrediBuild.BuildConsole.MakeCommand.History"); connect(d->makePathChooser, &PathChooser::rawPathChanged, this, [this] { d->m_activeCommandBuilder->setCommand(d->makePathChooser->rawPath()); |