Commit 216f1103 authored by Nikolai Kosjar's avatar Nikolai Kosjar
Browse files

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: default avatarMarco Bubke <marco.bubke@theqtcompany.com>
parent ccd92d8c
......@@ -33,6 +33,7 @@ SOURCES += \
clangmodelmanagersupport.cpp \
clangprojectsettings.cpp \
clangprojectsettingspropertiespage.cpp \
clangsymbol.cpp \
clangtextmark.cpp \
clangutils.cpp \
completionchunkstotextconverter.cpp \
......@@ -46,7 +47,6 @@ SOURCES += \
semanticmarker.cpp \
sourcelocation.cpp \
sourcemarker.cpp \
symbol.cpp \
unit.cpp \
unsavedfiledata.cpp \
utils.cpp \
......@@ -76,6 +76,7 @@ HEADERS += \
clangmodelmanagersupport.h \
clangprojectsettings.h \
clangprojectsettingspropertiespage.h \
clangsymbol.h \
clangtextmark.h \
clangutils.h \
completionchunkstotextconverter.h \
......@@ -91,7 +92,6 @@ HEADERS += \
semanticmarker.h \
sourcelocation.h \
sourcemarker.h \
symbol.h \
unit.h \
unsavedfiledata.h \
utils.h \
......
......@@ -143,6 +143,8 @@ QtcPlugin {
"clangprojectsettingspropertiespage.cpp",
"clangprojectsettingspropertiespage.h",
"clangprojectsettingspropertiespage.ui",
"clangsymbol.cpp",
"clangsymbol.h",
"clangtextmark.cpp",
"clangtextmark.h",
"clangutils.cpp",
......@@ -169,8 +171,6 @@ QtcPlugin {
"sourcelocation.h",
"sourcemarker.cpp",
"sourcemarker.h",
"symbol.cpp",
"symbol.h",
"unit.cpp",
"unit.h",
"unsavedfiledata.cpp",
......
......@@ -28,7 +28,7 @@
**
****************************************************************************/
#include "symbol.h"
#include "clangsymbol.h"
#include <cplusplus/Icons.h>
......
......@@ -31,7 +31,7 @@
#ifndef INDEX_H
#define INDEX_H
#include "symbol.h"
#include "clangsymbol.h"
#include <QtCore/QByteArray>
#include <QtCore/QString>
......
......@@ -32,7 +32,7 @@
#define INDEXER_H
#include "clang_global.h"
#include "symbol.h"
#include "clangsymbol.h"
#include "unit.h"
#include <cpptools/cppmodelmanager.h>
......
......@@ -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
......@@ -35,7 +35,7 @@
#include "projectpart.h"
#include "projects.h"
#include "translationunit.h"
#include "clangtranslationunit.h"
#include "translationunits.h"
#include "unsavedfiles.h"
......
......@@ -28,7 +28,7 @@
**
****************************************************************************/
#include "translationunit.h"
#include "clangtranslationunit.h"
#include "cursor.h"
#include "clangstring.h"
......
......@@ -28,7 +28,7 @@
**
****************************************************************************/
#include "type.h"
#include "clangtype.h"
#include "clangstring.h"
#include "cursor.h"
......
......@@ -34,7 +34,7 @@
#include "clangstring.h"
#include "codecompletefailedexception.h"
#include "codecompletionsextractor.h"
#include "translationunit.h"
#include "clangtranslationunit.h"
#include <clang-c/Index.h>
......
......@@ -31,7 +31,7 @@
#ifndef CLANGBACKEND_CODECOMPLETER_H
#define CLANGBACKEND_CODECOMPLETER_H
#include "translationunit.h"
#include "clangtranslationunit.h"
#include <codecompletion.h>
......
......@@ -31,7 +31,7 @@
#ifndef CLANGBACKEND_CURSOR_H
#define CLANGBACKEND_CURSOR_H
#include "type.h"
#include "clangtype.h"
#include <clang-c/Index.h>
......
......@@ -31,7 +31,7 @@
#include "sourcelocation.h"
#include "clangstring.h"
#include "translationunit.h"
#include "clangtranslationunit.h"
#include <utf8string.h>
......
......@@ -32,7 +32,7 @@
#define CLANGBACKEND_TRANSLATIONUNITS_H
#include "clangfilesystemwatcher.h"
#include "translationunit.h"
#include "clangtranslationunit.h"
#include <filecontainer.h>
......
......@@ -31,7 +31,7 @@
#include <clangcodecompleteresults.h>
#include <projectpart.h>
#include <projects.h>
#include <translationunit.h>
#include <clangtranslationunit.h>
#include <translationunits.h>
#include <unsavedfiles.h>
#include <utf8string.h>
......
......@@ -33,7 +33,7 @@
#include <filecontainer.h>
#include <projectpart.h>
#include <projects.h>
#include <translationunit.h>
#include <clangtranslationunit.h>
#include <translationunits.h>
#include <unsavedfiles.h>
#include <utf8stringvector.h>
......
......@@ -32,7 +32,7 @@
#include <filecontainer.h>
#include <projectpart.h>
#include <projects.h>
#include <translationunit.h>
#include <clangtranslationunit.h>
#include <translationunits.h>
#include <unsavedfiles.h>
#include <utf8stringvector.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment