forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/4.4'
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:
@@ -12,6 +12,7 @@ HEADERS += \
|
||||
$$PWD/clangdocumentprocessor.h \
|
||||
$$PWD/clangdocumentprocessors.h \
|
||||
$$PWD/clangdocuments.h \
|
||||
$$PWD/clangdocumentsuspenderresumer.h \
|
||||
$$PWD/clangexceptions.h \
|
||||
$$PWD/clangfilepath.h \
|
||||
$$PWD/clangfilesystemwatcher.h \
|
||||
@@ -25,8 +26,10 @@ HEADERS += \
|
||||
$$PWD/clangreparsesupportivetranslationunitjob.h \
|
||||
$$PWD/clangrequestdocumentannotationsjob.h \
|
||||
$$PWD/clangrequestreferencesjob.h \
|
||||
$$PWD/clangresumedocumentjob.h \
|
||||
$$PWD/clangstring.h \
|
||||
$$PWD/clangsupportivetranslationunitinitializer.h \
|
||||
$$PWD/clangsuspenddocumentjob.h \
|
||||
$$PWD/clangtranslationunit.h \
|
||||
$$PWD/clangtranslationunits.h \
|
||||
$$PWD/clangtranslationunitupdater.h \
|
||||
@@ -64,6 +67,7 @@ SOURCES += \
|
||||
$$PWD/clangdocumentprocessor.cpp \
|
||||
$$PWD/clangdocumentprocessors.cpp \
|
||||
$$PWD/clangdocuments.cpp \
|
||||
$$PWD/clangdocumentsuspenderresumer.cpp \
|
||||
$$PWD/clangexceptions.cpp \
|
||||
$$PWD/clangfilepath.cpp \
|
||||
$$PWD/clangfilesystemwatcher.cpp \
|
||||
@@ -73,10 +77,12 @@ SOURCES += \
|
||||
$$PWD/clangjobrequest.cpp \
|
||||
$$PWD/clangjobs.cpp \
|
||||
$$PWD/clangparsesupportivetranslationunitjob.cpp \
|
||||
$$PWD/clangresumedocumentjob.cpp \
|
||||
$$PWD/clangreferencescollector.cpp \
|
||||
$$PWD/clangreparsesupportivetranslationunitjob.cpp \
|
||||
$$PWD/clangrequestdocumentannotationsjob.cpp \
|
||||
$$PWD/clangrequestreferencesjob.cpp \
|
||||
$$PWD/clangsuspenddocumentjob.cpp \
|
||||
$$PWD/clangsupportivetranslationunitinitializer.cpp \
|
||||
$$PWD/clangtranslationunit.cpp \
|
||||
$$PWD/clangtranslationunits.cpp \
|
||||
|
||||
Reference in New Issue
Block a user