feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

JSON wizards: Don't add paths from environment over and over

Browse Source 
It would add the paths from the environment variable again, each time
the searchPaths are requested

Change-Id: I2650ba832e23b5fcd6bfd363389e1eaf3beddb9d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Eike Ziller
2022-11-18 15:24:26 +01:00
parent c18d8773db
commit f5efd9acc0
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
View File

@@ -505,10 +505,15 @@ static QStringList environmentTemplatesPaths()
FilePaths &JsonWizardFactory::searchPaths() FilePaths &JsonWizardFactory::searchPaths()
{ {
static FilePaths m_searchPaths = {Core::ICore::userResourcePath(WIZARD_PATH), static FilePaths m_searchPaths;
static bool searchPathsInitialized = false;
if (!searchPathsInitialized) {
searchPathsInitialized = true;
m_searchPaths = {Core::ICore::userResourcePath(WIZARD_PATH),
Core::ICore::resourcePath(WIZARD_PATH)}; Core::ICore::resourcePath(WIZARD_PATH)};
for (const QString &environmentTemplateDirName : environmentTemplatesPaths()) for (const QString &environmentTemplateDirName : environmentTemplatesPaths())
m_searchPaths << FilePath::fromString(environmentTemplateDirName); m_searchPaths << FilePath::fromString(environmentTemplateDirName);
}
return m_searchPaths; return m_searchPaths;
} }