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

Clang: Allow avoiding supportive translation unit for debugging

Browse Source 
...by providing QTC_CLANG_NO_SUPPORTIVE_TRANSLATIONUNIT=1 in the run
environment.

Change-Id: If4e92521dfbc2752e4446e7037876d28683c1f66
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Nikolai Kosjar
2016-10-25 11:40:32 +02:00
parent f911ddba86
commit a102ee0729
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/tools/clangbackend/ipcsource/clangcodemodelserver.cpp
View File

@@ -55,6 +55,12 @@
#include <QCoreApplication>
#include <QDebug>
static bool useSupportiveTranslationUnit()
{
static bool use = !qEnvironmentVariableIntValue("QTC_CLANG_NO_SUPPORTIVE_TRANSLATIONUNIT");
return use;
}
namespace ClangBackEnd {
ClangCodeModelServer::ClangCodeModelServer()
@@ -116,9 +122,7 @@ void ClangCodeModelServer::updateTranslationUnitsForEditor(const UpdateTranslati
// we might block the translation unit for a completion request
// that comes right after this message.
updateDocumentAnnotationsTimer.start(0);
QTimer::singleShot(0, [this, updateDocuments](){
startInitializingSupportiveTranslationUnits(updateDocuments);
});
delayStartInitializingSupportiveTranslationUnits(updateDocuments);
}
} catch (const std::exception &exception) {
qWarning() << "Error in ClangCodeModelServer::updateTranslationUnitsForEditor:" << exception.what();
@@ -329,6 +333,16 @@ void ClangCodeModelServer::processInitialJobsForDocuments(const std::vector<Docu
}
}
void ClangCodeModelServer::delayStartInitializingSupportiveTranslationUnits(
const std::vector<Document> &documents)
{
if (useSupportiveTranslationUnit()) {
QTimer::singleShot(0, [this, documents](){
startInitializingSupportiveTranslationUnits(documents);
});
}
}
void ClangCodeModelServer::startInitializingSupportiveTranslationUnits(
const std::vector<Document> &documents)
{

1
src/tools/clangbackend/ipcsource/clangcodemodelserver.h
View File

@@ -72,6 +72,7 @@ private:
void startDocumentAnnotationsTimerIfFileIsNotOpenAsDocument(const Utf8String &filePath);
void processInitialJobsForDocuments(const std::vector<Document> &documents);
void delayStartInitializingSupportiveTranslationUnits(const std::vector<Document> &documents);
void startInitializingSupportiveTranslationUnits(const std::vector<Document> &documents);
void processJobsForDirtyAndVisibleDocuments();