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

Update the project.

Browse Source
This commit is contained in:
Roberto Raggi
2009-03-16 12:42:16 +01:00
parent dd76a16fe1
commit f7812edfe1
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -178,7 +178,12 @@ void GenericProject::parseProject()
_projectIncludePaths.removeDuplicates();
_generated = convertToAbsoluteFiles(projectInfo.value(QLatin1String("generated")).toStringList());
_defines = projectInfo.value(QLatin1String("defines")).toStringList();
_defines.clear();
QFile configFn(configFileName());
if (configFn.open(QFile::ReadOnly))
_defines = configFn.readAll();
emit fileListChanged();
}
@@ -198,6 +203,8 @@ void GenericProject::refresh()
CppTools::CppModelManagerInterface::ProjectInfo pinfo = modelManager->projectInfo(this);
pinfo.defines = predefinedMacros;
pinfo.defines += '\n';
pinfo.defines += _defines;
QStringList allIncludePaths, allFrameworkPaths;
@@ -259,12 +266,9 @@ QStringList GenericProject::includePaths() const
void GenericProject::setIncludePaths(const QStringList &includePaths)
{ _includePaths = includePaths; }
QStringList GenericProject::defines() const
QByteArray GenericProject::defines() const
{ return _defines; }
void GenericProject::setDefines(const QStringList &defines)
{ _defines = defines; }
void GenericProject::setToolChainId(const QString &toolChainId)
{
using namespace ProjectExplorer;