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

Supply c++11 flags and per-project info to c++ code model.

Browse Source 
A manual squash/merge of the changes below, plus a couple of subsequent
code fixes.

59085aa5fbb99e2d786cd2c1a06c24a111ccb49f:
    Modify CppModel::ProjectInfo

    Adding per project node information, to pass on the correct
    defines/includes for each file, instead of aggregating them incorrectly.

    Also split up SOURCES and OBJECTIVE_SOURCES.

    Also ask the toolchain to convert the compilerflags to flags the
    codemodel understands, for now only gcc and only c++11.

    Also make the toolchain aware of the flags used to compile, so that it
    can emit the correct defines.

    Note: No header files are passed on.

74028802314cd4e75b41b46407433e07090a304d:
    GCC: Evaluate cxxflags when checking for predefined macros

ebaaa4957e4c02cc9637a998eddae1d0acd74f83:
    MSVC: Take cxxflags into account when checking for predefined macros

9bfce7e889bcf7bcc47bf880e3ea25945ca7d0d7:
    Compile fixes

Change-Id: I9de94ad038dfc5dc1987732e84b13fb4419c96f5
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
This commit is contained in:
Erik Verbruggen
2012-02-16 15:09:56 +01:00
parent 89e64b5aed
commit 3aab8beaf4
31 changed files with 519 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
View File

@@ -513,19 +513,23 @@ void AutotoolsProject::updateCppCodeModel()
CPlusPlus::CppModelManagerInterface::ProjectInfo pinfo = modelManager->projectInfo(this);
const bool update = (pinfo.includePaths != allIncludePaths)
|| (pinfo.sourceFiles != m_files)
|| (pinfo.defines != m_toolChain->predefinedMacros())
|| (pinfo.frameworkPaths != allFrameworkPaths);
const bool update = (pinfo.includePaths() != allIncludePaths)
|| (pinfo.sourceFiles() != m_files)
|| (pinfo.defines() != m_toolChain->predefinedMacros(QStringList()))
|| (pinfo.frameworkPaths() != allFrameworkPaths);
if (update) {
pinfo.includePaths = allIncludePaths;
pinfo.sourceFiles = m_files;
pinfo.clearProjectParts();
CPlusPlus::CppModelManagerInterface::ProjectPart::Ptr part(
new CPlusPlus::CppModelManagerInterface::ProjectPart);
part->includePaths = allIncludePaths;
part->sourceFiles = m_files;
if (m_toolChain)
pinfo.defines = m_toolChain->predefinedMacros();
pinfo.frameworkPaths = allFrameworkPaths;
modelManager->updateProjectInfo(pinfo);
modelManager->updateSourceFiles(pinfo.sourceFiles);
}
part->defines = m_toolChain->predefinedMacros(QStringList());
part->frameworkPaths = allFrameworkPaths;
part->language = CPlusPlus::CppModelManagerInterface::CXX;
pinfo.appendProjectPart(part);
modelManager->updateProjectInfo(pinfo);
modelManager->updateProjectInfo(pinfo);
modelManager->updateSourceFiles(m_files);
}
}