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

QbsProjectManager: Avoid allocations when checking environment variables

Browse Source 
Use qEnvironmentVariableIsEmpty instead of qgetenv(...).isEmpty().
Found by clazy.

Change-Id: I62054e68c3b51c69be4ce6605ed6aef20633c9a9
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Joerg Bornemann
2017-10-19 13:58:36 +02:00
parent 7aaaade138
commit 235f9be955
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qbsprojectmanager/qbsbuildstep.cpp
View File

@@ -497,7 +497,7 @@ void QbsBuildStep::build()
options.setChangedFiles(m_changedFiles); options.setChangedFiles(m_changedFiles);
options.setFilesToConsider(m_changedFiles); options.setFilesToConsider(m_changedFiles);
options.setActiveFileTags(m_activeFileTags); options.setActiveFileTags(m_activeFileTags);
options.setLogElapsedTime(!qgetenv(Constants::QBS_PROFILING_ENV).isEmpty()); options.setLogElapsedTime(!qEnvironmentVariableIsEmpty(Constants::QBS_PROFILING_ENV));
QString error; QString error;
m_job = qbsProject()->build(options, m_products, error); m_job = qbsProject()->build(options, m_products, error);

2
src/plugins/qbsprojectmanager/qbsprojectparser.cpp
View File

@@ -108,7 +108,7 @@ void QbsProjectParser::parse(const QVariantMap &config, const Environment &env,
params.setLibexecPath(libExecDirectory()); params.setLibexecPath(libExecDirectory());
params.setProductErrorMode(qbs::ErrorHandlingMode::Relaxed); params.setProductErrorMode(qbs::ErrorHandlingMode::Relaxed);
params.setPropertyCheckingMode(qbs::ErrorHandlingMode::Relaxed); params.setPropertyCheckingMode(qbs::ErrorHandlingMode::Relaxed);
params.setLogElapsedTime(!qgetenv(Constants::QBS_PROFILING_ENV).isEmpty()); params.setLogElapsedTime(!qEnvironmentVariableIsEmpty(Constants::QBS_PROFILING_ENV));
m_qbsSetupProjectJob = m_project.setupProject(params, QbsManager::logSink(), 0); m_qbsSetupProjectJob = m_project.setupProject(params, QbsManager::logSink(), 0);