diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-05-09 16:37:41 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-05-09 16:37:41 +0200 |
| commit | 9e66ce48e432765073dad411bae5d0ff9a093c19 (patch) | |
| tree | 1af4f549a1bad6815b10c98ff0031e9304033d86 /src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri | |
| parent | f63d64330ef8a26df23669e78a45b0655a773406 (diff) | |
| parent | 605ea627cc4fdd1d64e7a1388ed442293ffd0981 (diff) | |
| download | qt-creator-9e66ce48e432765073dad411bae5d0ff9a093c19.tar.gz | |
Merge remote-tracking branch 'origin/4.0'
Conflicts:
src/plugins/autotest/testcodeparser.cpp
src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri
tests/unit/unittest/unittest.pro
Change-Id: I9db4fbea6ea7c9fdd0d8e1703735af20c92e754b
Diffstat (limited to 'src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri')
| -rw-r--r-- | src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri b/src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri index 6308ca01e5..7186ec858d 100644 --- a/src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri +++ b/src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri @@ -33,7 +33,8 @@ HEADERS += $$PWD/clangipcserver.h \ $$PWD/clangtype.h \ $$PWD/highlightingmark.h \ $$PWD/highlightingmarks.h \ - $$PWD/highlightingmarksiterator.h + $$PWD/highlightingmarksiterator.h \ + $$PWD/utf8positionfromlinecolumn.h SOURCES += $$PWD/clangipcserver.cpp \ $$PWD/codecompleter.cpp \ @@ -66,4 +67,5 @@ SOURCES += $$PWD/clangipcserver.cpp \ $$PWD/clangtranslationunit.cpp \ $$PWD/clangtype.cpp \ $$PWD/highlightingmark.cpp \ - $$PWD/highlightingmarks.cpp + $$PWD/highlightingmarks.cpp \ + $$PWD/utf8positionfromlinecolumn.cpp |