From 17354cebadf86d9a7ce1e981d1ebf415079e30d0 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 17 Oct 2019 18:29:02 +0200 Subject: [PATCH] McuSupport: Allow PackageOptions to return different path than selected one ... by adding a relativePathModifier property Change-Id: I5e4a13ffb43566f7ed221dfc926731abc0460853 Reviewed-by: hjk --- src/plugins/mcusupport/mcusupportoptionspage.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/plugins/mcusupport/mcusupportoptionspage.cpp b/src/plugins/mcusupport/mcusupportoptionspage.cpp index cb659fea5ed..2459776b39c 100644 --- a/src/plugins/mcusupport/mcusupportoptionspage.cpp +++ b/src/plugins/mcusupport/mcusupportoptionspage.cpp @@ -80,6 +80,7 @@ public: void setAddToPath(bool addToPath); bool addToPath() const; void writeToSettings() const; + void setRelativePathModifier(const QString &path); QWidget *widget(); @@ -103,6 +104,7 @@ private: const QString m_settingsKey; QString m_path; + QString m_relativePathModifier; // relative path to m_path to be returned by path() QUrl m_downloadUrl; QString m_environmentVariableName; bool m_addToPath = false; @@ -126,7 +128,7 @@ PackageOptions::PackageOptions(const QString &label, const QString &defaultPath, QString PackageOptions::path() const { - return m_fileChooser->path(); + return QFileInfo(m_fileChooser->path() + m_relativePathModifier).absoluteFilePath(); } QString PackageOptions::label() const @@ -220,6 +222,11 @@ void PackageOptions::writeToSettings() const s->endGroup(); } +void PackageOptions::setRelativePathModifier(const QString &path) +{ + m_relativePathModifier = path; +} + void PackageOptions::updateStatus() { m_path = m_fileChooser->rawPath();