Merge remote-tracking branch 'origin/4.1'

Change-Id: I35ef0d667c759c959edce91569f05ebc7a8ff4d8
This commit is contained in:
Eike Ziller
2016-07-05 11:28:27 +02:00
231 changed files with 1358 additions and 1236 deletions

View File

@@ -34,7 +34,8 @@ HEADERS += $$PWD/clangcodemodelserver.h \
$$PWD/highlightingmark.h \
$$PWD/highlightingmarks.h \
$$PWD/highlightingmarksiterator.h \
$$PWD/utf8positionfromlinecolumn.h
$$PWD/utf8positionfromlinecolumn.h \
$$PWD/clangfilepath.h
SOURCES += $$PWD/clangcodemodelserver.cpp \
$$PWD/codecompleter.cpp \
@@ -68,4 +69,5 @@ SOURCES += $$PWD/clangcodemodelserver.cpp \
$$PWD/clangtype.cpp \
$$PWD/highlightingmark.cpp \
$$PWD/highlightingmarks.cpp \
$$PWD/utf8positionfromlinecolumn.cpp
$$PWD/utf8positionfromlinecolumn.cpp \
$$PWD/clangfilepath.cpp