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>
This commit is contained in:
Nikolai Kosjar
2015-11-24 11:17:18 +01:00
parent ccd92d8c0b
commit 216f110385
30 changed files with 34 additions and 34 deletions

View File

@@ -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