diff options
| author | Sivert Krøvel <sivert.krovel@qt.io> | 2023-03-13 12:41:33 +0100 |
|---|---|---|
| committer | Sivert Krøvel <sivert.krovel@qt.io> | 2023-03-14 16:00:29 +0000 |
| commit | f4d72ebd794e78abfd442f4249c4fa31335688b7 (patch) | |
| tree | dc1ae0bf702e4f3d2ed204e116b6b74b3a694678 | |
| parent | 15e1a6476435c0d32fddbdfbd25d7cd00ba64b4a (diff) | |
McuSupport: Use settings before env var when setting package paths
If an environment variable corresponding to a package dependency
was set, this took precedence over the path set in the settings
file, making it impossible to change in the UI. With this change,
the environment variable is only used when no matching settings
entry is found.
Task-number: QTCREATORBUG-28488
Change-Id: Iee2e0bec402a4dce2f9590cd86ca3854e1e5ae90
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| -rw-r--r-- | src/plugins/mcusupport/mcupackage.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/mcusupport/mcupackage.cpp b/src/plugins/mcusupport/mcupackage.cpp index ccf3a2d3ac..f41b119338 100644 --- a/src/plugins/mcusupport/mcupackage.cpp +++ b/src/plugins/mcusupport/mcupackage.cpp @@ -53,9 +53,9 @@ McuPackage::McuPackage(const SettingsHandler::Ptr &settingsHandler, , m_addToSystemPath(addToSystemPath) , m_valueType(valueType) { - m_path = FilePath::fromUserInput(qtcEnvironmentVariable(m_environmentVariableName)); - if (!m_path.exists()) { - m_path = this->settingsHandler->getPath(settingsKey, QSettings::UserScope, m_defaultPath); + m_path = this->settingsHandler->getPath(settingsKey, QSettings::UserScope, m_defaultPath); + if (m_path.isEmpty()) { + m_path = FilePath::fromUserInput(qtcEnvironmentVariable(m_environmentVariableName)); } } |