forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/13.0'
Change-Id: If752e3383b35873b696e8beca27d8838a4096c8a
This commit is contained in:
@@ -294,10 +294,7 @@ ClangModelManagerSupport::ClangModelManagerSupport()
|
||||
new ClangdQuickFixFactory(); // memory managed by CppEditor::g_cppQuickFixFactories
|
||||
}
|
||||
|
||||
ClangModelManagerSupport::~ClangModelManagerSupport()
|
||||
{
|
||||
m_generatorSynchronizer.waitForFinished();
|
||||
}
|
||||
ClangModelManagerSupport::~ClangModelManagerSupport() = default;
|
||||
|
||||
void ClangModelManagerSupport::followSymbol(const CursorInEditor &data,
|
||||
const LinkHandler &processLinkCallback,
|
||||
|
||||
@@ -94,10 +94,10 @@ private:
|
||||
void scheduleClientRestart(ClangdClient *client);
|
||||
static ClangdClient *clientWithProject(const ProjectExplorer::Project *project);
|
||||
|
||||
Utils::FutureSynchronizer m_generatorSynchronizer;
|
||||
QList<QPointer<ClangdClient>> m_clientsToRestart;
|
||||
QTimer * const m_clientRestartTimer;
|
||||
QHash<Utils::FilePath, QString> m_potentialShadowDocuments;
|
||||
Utils::FutureSynchronizer m_generatorSynchronizer; // Keep me last
|
||||
};
|
||||
|
||||
} // namespace Internal
|
||||
|
||||
Reference in New Issue
Block a user