From 1deb31f295210fd6198c492b4e8fa4be9338dde8 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Thu, 25 Jan 2024 10:09:50 +0100 Subject: [PATCH] AppMan: Use FilePathAspect::setDefaultPathValue(FilePath) Change-Id: Ia8025bc707fd1d87b4066fcee98b8566f13726d6 Reviewed-by: hjk --- .../appmanagercreatepackagestep.cpp | 2 +- .../appmanagerinstallpackagestep.cpp | 10 +++++----- .../appmanagerrunconfiguration.cpp | 4 ++-- .../qtapplicationmanager/appmanagerutilities.cpp | 4 ++-- src/plugins/qtapplicationmanager/appmanagerutilities.h | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/plugins/qtapplicationmanager/appmanagercreatepackagestep.cpp b/src/plugins/qtapplicationmanager/appmanagercreatepackagestep.cpp index e935da5493f..7c6c31a6133 100644 --- a/src/plugins/qtapplicationmanager/appmanagercreatepackagestep.cpp +++ b/src/plugins/qtapplicationmanager/appmanagercreatepackagestep.cpp @@ -40,7 +40,7 @@ public: setDisplayName(Tr::tr("Create Application Manager package")); packager.setSettingsKey(SETTINGSPREFIX "Executable"); - packager.setDefaultValue(getToolFilePath(Constants::APPMAN_PACKAGER, kit())); + packager.setDefaultPathValue(getToolFilePath(Constants::APPMAN_PACKAGER, kit())); arguments.setSettingsKey(SETTINGSPREFIX "Arguments"); arguments.setResetter([] { return QLatin1String(ArgumentsDefault); }); diff --git a/src/plugins/qtapplicationmanager/appmanagerinstallpackagestep.cpp b/src/plugins/qtapplicationmanager/appmanagerinstallpackagestep.cpp index 35adebb4272..3b2871c97af 100644 --- a/src/plugins/qtapplicationmanager/appmanagerinstallpackagestep.cpp +++ b/src/plugins/qtapplicationmanager/appmanagerinstallpackagestep.cpp @@ -54,9 +54,9 @@ AppManagerInstallPackageStep::AppManagerInstallPackageStep(BuildStepList *bsl, I { setDisplayName(tr("Install Application Manager package")); - controller.setDefaultValue(getToolFilePath(Constants::APPMAN_CONTROLLER, - target()->kit(), - DeviceKitAspect::device(target()->kit()))); + controller.setDefaultPathValue(getToolFilePath(Constants::APPMAN_CONTROLLER, + target()->kit(), + DeviceKitAspect::device(target()->kit()))); arguments.setSettingsKey(SETTINGSPREFIX "Arguments"); arguments.setResetter([] { return QLatin1String(ArgumentsDefault); }); @@ -75,11 +75,11 @@ AppManagerInstallPackageStep::AppManagerInstallPackageStep(BuildStepList *bsl, I const TargetInformation targetInformation(target()); if (DeviceKitAspect::device(kit())->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) { - packageFile.setDefaultValue(targetInformation.packageFilePath.toUserOutput()); + packageFile.setDefaultPathValue(targetInformation.packageFilePath); } else { const Utils::FilePath packageFilePath = targetInformation.runDirectory.pathAppended( targetInformation.packageFilePath.fileName()); - packageFile.setDefaultValue(packageFilePath.toUserOutput()); + packageFile.setDefaultPathValue(packageFilePath); } setEnabled(!targetInformation.isBuiltin); diff --git a/src/plugins/qtapplicationmanager/appmanagerrunconfiguration.cpp b/src/plugins/qtapplicationmanager/appmanagerrunconfiguration.cpp index 4d2189e876b..f53e709c121 100644 --- a/src/plugins/qtapplicationmanager/appmanagerrunconfiguration.cpp +++ b/src/plugins/qtapplicationmanager/appmanagerrunconfiguration.cpp @@ -41,8 +41,8 @@ public: return; const TargetInformation targetInformation = tis.at(0); - controller.setValue(FilePath::fromString(getToolFilePath(Constants::APPMAN_CONTROLLER, kit(), - DeviceKitAspect::device(kit())))); + controller.setValue(getToolFilePath(Constants::APPMAN_CONTROLLER, kit(), + DeviceKitAspect::device(kit()))); appId.setValue(targetInformation.manifest.id); appId.setReadOnly(true); diff --git a/src/plugins/qtapplicationmanager/appmanagerutilities.cpp b/src/plugins/qtapplicationmanager/appmanagerutilities.cpp index 2a490fd682b..9c8ad063aa5 100644 --- a/src/plugins/qtapplicationmanager/appmanagerutilities.cpp +++ b/src/plugins/qtapplicationmanager/appmanagerutilities.cpp @@ -38,14 +38,14 @@ static FilePath getToolPathByQtVersion(const QtVersion *qtVersion, return {}; } -QString getToolFilePath(const QString &toolname, const Kit *kit, const IDevice::ConstPtr &device) +FilePath getToolFilePath(const QString &toolname, const Kit *kit, const IDevice::ConstPtr &device) { const bool local = !device || device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE; const FilePath path = local ? getToolPathByQtVersion(QtKitAspect::qtVersion(kit)) : FilePath(Constants::REMOTE_DEFAULT_BIN_PATH); const QString name = getToolNameByDevice(toolname, device); const QString filePath = !path.isEmpty() ? path.pathAppended(name).toString() : name; - return !device ? filePath : device->filePath(filePath).toUserOutput(); + return !device ? FilePath::fromString(filePath) : device->filePath(filePath); } QString getToolNameByDevice(const QString &baseName, const QSharedPointer &device) diff --git a/src/plugins/qtapplicationmanager/appmanagerutilities.h b/src/plugins/qtapplicationmanager/appmanagerutilities.h index db0af103752..31497966e6b 100644 --- a/src/plugins/qtapplicationmanager/appmanagerutilities.h +++ b/src/plugins/qtapplicationmanager/appmanagerutilities.h @@ -10,6 +10,6 @@ namespace AppManager::Internal { QString getToolNameByDevice(const QString &baseName, const QSharedPointer &device = nullptr); -QString getToolFilePath(const QString &toolname, const ProjectExplorer::Kit *kit, const ProjectExplorer::IDevice::ConstPtr &device = nullptr); +Utils::FilePath getToolFilePath(const QString &toolname, const ProjectExplorer::Kit *kit, const ProjectExplorer::IDevice::ConstPtr &device = nullptr); } // AppManager::Internal