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

ProjectExplorer: Make MsvcToolChain::m_headerPathsMutex a member

Browse Source 
Ensures construction in all constructor lines.

Change-Id: I2c0ec3eadfb4b4da67c5915f9d50be277c0a32c6
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2019-06-14 13:37:31 +02:00
parent 7f970cebb3
commit b508eac2a5
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/projectexplorer/msvctoolchain.cpp
View File

@@ -849,7 +849,6 @@ MsvcToolChain::MsvcToolChain(Core::Id typeId,
const QString &varsBat, const QString &varsBat,
const QString &varsBatArg) const QString &varsBatArg)
: ToolChain(typeId) : ToolChain(typeId)
, m_headerPathsMutex(new QMutex)
, m_lastEnvironment(Utils::Environment::systemEnvironment()) , m_lastEnvironment(Utils::Environment::systemEnvironment())
, m_abi(abi) , m_abi(abi)
, m_vcvarsBat(varsBat) , m_vcvarsBat(varsBat)
@@ -894,7 +893,6 @@ void MsvcToolChain::inferWarningsForLevel(int warningLevel, WarningFlags &flags)
MsvcToolChain::~MsvcToolChain() MsvcToolChain::~MsvcToolChain()
{ {
g_availableMsvcToolchains.removeOne(this); g_availableMsvcToolchains.removeOne(this);
delete m_headerPathsMutex;
} }
Abi MsvcToolChain::targetAbi() const Abi MsvcToolChain::targetAbi() const
@@ -1154,7 +1152,7 @@ ToolChain::BuiltInHeaderPathsRunner MsvcToolChain::createBuiltInHeaderPathsRunne
addToEnvironment(env); addToEnvironment(env);
return [this, env](const QStringList &, const QString &, const QString &) { return [this, env](const QStringList &, const QString &, const QString &) {
QMutexLocker locker(m_headerPathsMutex); QMutexLocker locker(&m_headerPathsMutex);
if (m_headerPaths.isEmpty()) { if (m_headerPaths.isEmpty()) {
foreach (const QString &path, foreach (const QString &path,
env.value(QLatin1String("INCLUDE")).split(QLatin1Char(';'))) { env.value(QLatin1String("INCLUDE")).split(QLatin1Char(';'))) {
@@ -1786,7 +1784,7 @@ Utils::LanguageVersion ClangClToolChain::msvcLanguageVersion(const QStringList &
ClangClToolChain::BuiltInHeaderPathsRunner ClangClToolChain::createBuiltInHeaderPathsRunner() const ClangClToolChain::BuiltInHeaderPathsRunner ClangClToolChain::createBuiltInHeaderPathsRunner() const
{ {
{ {
QMutexLocker locker(m_headerPathsMutex); QMutexLocker locker(&m_headerPathsMutex);
m_headerPaths.clear(); m_headerPaths.clear();
} }

2
src/plugins/projectexplorer/msvctoolchain.h
View File

@@ -146,7 +146,7 @@ protected:
void initEnvModWatcher(const QFuture<GenerateEnvResult> &future); void initEnvModWatcher(const QFuture<GenerateEnvResult> &future);
protected: protected:
mutable QMutex *m_headerPathsMutex = nullptr; mutable QMutex m_headerPathsMutex;
mutable HeaderPaths m_headerPaths; mutable HeaderPaths m_headerPaths;
private: private: