feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.0'

Browse Source 
Conflicts:
	qtcreator.pri
	src/plugins/qnx/qnxutils.cpp

Change-Id: I019ad21fb4c128eb736c8ab2d09310757e3be037
This commit is contained in:
Eike Ziller
2013-10-24 08:56:29 +02:00
parent 328daa9c5a b889bb1608
commit c3119d1aa7
192 changed files with 2423 additions and 1016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -255,6 +255,8 @@ void GenericProject::refresh(RefreshOptions options)
part->displayName = displayName();
part->projectFile = projectFilePath();
part->includePaths += projectIncludePaths();
Kit *k = activeTarget() ? activeTarget()->kit() : KitManager::defaultKit();
if (ToolChain *tc = ToolChainKitInformation::toolChain(k)) {
QStringList cxxflags; // FIXME: Can we do better?
@@ -263,7 +265,6 @@ void GenericProject::refresh(RefreshOptions options)
}
part->cxxVersion = CppTools::ProjectPart::CXX11; // assume C++11
part->includePaths += allIncludePaths();
part->defines += m_defines;
// ### add _defines.
@@ -337,15 +338,6 @@ QStringList GenericProject::processEntries(const QStringList &paths,
return absolutePaths;
}
QStringList GenericProject::allIncludePaths() const
{
QStringList paths;
paths += m_includePaths;
paths += m_projectIncludePaths;
paths.removeDuplicates();
return paths;
}
QStringList GenericProject::projectIncludePaths() const
{
return m_projectIncludePaths;
@@ -356,16 +348,6 @@ QStringList GenericProject::files() const
return m_files;
}
QStringList GenericProject::includePaths() const
{
return m_includePaths;
}
void GenericProject::setIncludePaths(const QStringList &includePaths)
{
m_includePaths = includePaths;
}
QByteArray GenericProject::defines() const
{
return m_defines;
@@ -425,8 +407,6 @@ bool GenericProject::fromMap(const QVariantMap &map)
t->addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(t));
}
setIncludePaths(allIncludePaths());
refresh(Everything);
return true;
}