diff options
| author | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-11-24 11:17:18 +0100 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-11-26 13:54:21 +0000 |
| commit | 216f110385f4854c22229430b839b3245a255135 (patch) | |
| tree | 88cda4dc6b4d814d61b05c9b076826ac743ce82b /src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri | |
| parent | ccd92d8c0bc27e203ed05afcdb5ee3532a5d17ed (diff) | |
| download | qt-creator-216f110385f4854c22229430b839b3245a255135.tar.gz | |
Clang: Tests on MSVC2013: Fix file name clashes
The following files conflicted:
src\tools\clangbackend\ipcsource\translationunit.cpp
src\libs\3rdparty\cplusplus\TranslationUnit.cpp
src\libs\3rdparty\cplusplus\Type.cpp
src\tools\clangbackend\ipcsource\type.cpp
src\libs\3rdparty\cplusplus\Symbol.cpp
src\plugins\clangcodemodel\symbol.cpp
Change-Id: If7865570cd70e39e25cc8d508f771c8023288f0c
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
Diffstat (limited to 'src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri')
| -rw-r--r-- | src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri b/src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri index 93131082bf..1724c5799c 100644 --- a/src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri +++ b/src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri @@ -3,7 +3,6 @@ INCLUDEPATH += $$PWD HEADERS += $$PWD/clangipcserver.h \ $$PWD/codecompleter.h \ $$PWD/clangstring.h \ - $$PWD/translationunit.h \ $$PWD/translationunitisnullexception.h \ $$PWD/codecompletefailedexception.h \ $$PWD/clangcodecompleteresults.h \ @@ -27,16 +26,16 @@ HEADERS += $$PWD/clangipcserver.h \ $$PWD/translationunitalreadyexistsexception.h \ $$PWD/commandlinearguments.h \ $$PWD/cursor.h \ - $$PWD/type.h \ $$PWD/highlightinginformations.h \ $$PWD/highlightinginformation.h \ $$PWD/highlightinginformationsiterator.h \ - $$PWD/skippedsourceranges.h + $$PWD/skippedsourceranges.h \ + $$PWD/clangtranslationunit.h \ + $$PWD/clangtype.h SOURCES += $$PWD/clangipcserver.cpp \ $$PWD/codecompleter.cpp \ $$PWD/clangstring.cpp \ - $$PWD/translationunit.cpp \ $$PWD/translationunitisnullexception.cpp \ $$PWD/codecompletefailedexception.cpp \ $$PWD/clangcodecompleteresults.cpp \ @@ -59,7 +58,8 @@ SOURCES += $$PWD/clangipcserver.cpp \ $$PWD/translationunitalreadyexistsexception.cpp \ $$PWD/commandlinearguments.cpp \ $$PWD/cursor.cpp \ - $$PWD/type.cpp \ $$PWD/highlightinginformations.cpp \ $$PWD/highlightinginformation.cpp \ - $$PWD/skippedsourceranges.cpp + $$PWD/skippedsourceranges.cpp \ + $$PWD/clangtranslationunit.cpp \ + $$PWD/clangtype.cpp |