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

Merge remote-tracking branch 'origin/4.4'

Browse Source 
Conflicts:
	src/tools/clangbackend/ipcsource/clangiasyncjob.cpp
	src/tools/clangbackend/ipcsource/clangjobrequest.cpp
	src/tools/clangbackend/ipcsource/clangjobrequest.h

Change-Id: Ib8602530663813ade418f995dfd2a736908cfe75
This commit is contained in:
Eike Ziller
2017-08-15 10:07:51 +02:00
parent e6a50fd44a 885f8b5385
commit d8fd5292f1
209 changed files with 5006 additions and 2423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/tools/clangbackend/ipcsource/clangjobrequest.h
View File

@@ -54,15 +54,22 @@ public:
RequestDocumentAnnotations,
RequestReferences,
FollowSymbol,
SuspendDocument,
ResumeDocument,
};
enum class Condition {
NoCondition,
CurrentDocumentRevision,
NoCondition = 1 << 0,
DocumentVisible = 1 << 1,
DocumentNotVisible = 1 << 2,
DocumentSuspended = 1 << 3,
DocumentUnsuspended = 1 << 4,
CurrentDocumentRevision = 1 << 5,
};
Q_DECLARE_FLAGS(Conditions, Condition)
enum ExpirationReason {
enum class ExpirationReason {
Never = 1 << 0,
DocumentClosed = 1 << 1,