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

Clang: Extract some functions in LibClangOptionsBuilder

Browse Source 
...makes the high-level function build() less noisy.

Change-Id: Ib09fba315845a604166489fd400d0be14e16fc23
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2015-07-27 10:26:09 +02:00
parent fa67536272
commit 09b405d11e
1 changed files with 51 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/plugins/clangcodemodel/clangutils.cpp
View File

@@ -114,53 +114,27 @@ static bool maybeIncludeBorlandExtensions()
class LibClangOptionsBuilder : public CompilerOptionsBuilder class LibClangOptionsBuilder : public CompilerOptionsBuilder
{ {
public: public:
static QStringList build(const ProjectPart::Ptr &pPart, ProjectFile::Kind fileKind) static QStringList build(const ProjectPart::Ptr &projectPart, ProjectFile::Kind fileKind)
{ {
if (pPart.isNull()) if (projectPart.isNull())
return QStringList(); return QStringList();
LibClangOptionsBuilder optionsBuilder(pPart); LibClangOptionsBuilder optionsBuilder(projectPart);
if (verboseRunLog().isDebugEnabled()) if (verboseRunLog().isDebugEnabled())
optionsBuilder.add(QLatin1String("-v")); optionsBuilder.add(QLatin1String("-v"));
optionsBuilder.addLanguageOption(fileKind); optionsBuilder.addLanguageOption(fileKind);
optionsBuilder.addOptionsForLanguage(maybeIncludeBorlandExtensions()); optionsBuilder.addOptionsForLanguage(maybeIncludeBorlandExtensions());
optionsBuilder.addToolchainAndProjectDefines(); optionsBuilder.addToolchainAndProjectDefines();
static const QString resourceDir = getResourceDir(); optionsBuilder.addResourceDirOptions();
if (!resourceDir.isEmpty()) {
optionsBuilder.add(QLatin1String("-nostdlibinc"));
optionsBuilder.add(QLatin1String("-I") + resourceDir);
optionsBuilder.add(QLatin1String("-undef"));
}
optionsBuilder.addHeaderPathOptions(); optionsBuilder.addHeaderPathOptions();
optionsBuilder.addInjectedHeaderWithCustomQtMacros();
optionsBuilder.addProjectConfigFileInclude();
// Inject header file optionsBuilder.addExtraOptions();
static const QString injectedHeader = ICore::instance()->resourcePath()
+ QLatin1String("/cplusplus/qt%1-qobjectdefs-injected.h");
// if (pPart->qtVersion == ProjectPart::Qt4) {
// builder.addOption(QLatin1String("-include"));
// builder.addOption(injectedHeader.arg(QLatin1Char('4')));
// }
if (pPart->qtVersion == ProjectPart::Qt5) {
optionsBuilder.add(QLatin1String("-include"));
optionsBuilder.add(injectedHeader.arg(QLatin1Char('5')));
}
if (!pPart->projectConfigFile.isEmpty()) {
optionsBuilder.add(QLatin1String("-include"));
optionsBuilder.add(pPart->projectConfigFile);
}
optionsBuilder.add(QLatin1String("-fmessage-length=0"));
optionsBuilder.add(QLatin1String("-fdiagnostics-show-note-include-stack"));
optionsBuilder.add(QLatin1String("-fmacro-backtrace-limit=0"));
optionsBuilder.add(QLatin1String("-fretain-comments-from-system-headers"));
// TODO: -Xclang -ferror-limit -Xclang 0 ?
return optionsBuilder.options(); return optionsBuilder.options();
} }
@@ -175,6 +149,49 @@ private:
{ {
return path.contains(QLatin1String("lib/gcc/i686-apple-darwin")); return path.contains(QLatin1String("lib/gcc/i686-apple-darwin"));
} }
void addResourceDirOptions()
{
static const QString resourceDir = getResourceDir();
if (!resourceDir.isEmpty()) {
add(QLatin1String("-nostdlibinc"));
add(QLatin1String("-I") + resourceDir);
add(QLatin1String("-undef"));
}
}
void addInjectedHeaderWithCustomQtMacros()
{
static const QString injectedHeader = ICore::instance()->resourcePath()
+ QLatin1String("/cplusplus/qt%1-qobjectdefs-injected.h");
// if (pPart->qtVersion == ProjectPart::Qt4) {
// builder.addOption(QLatin1String("-include"));
// builder.addOption(injectedHeader.arg(QLatin1Char('4')));
// }
if (m_projectPart->qtVersion == ProjectPart::Qt5) {
add(QLatin1String("-include"));
add(injectedHeader.arg(QLatin1Char('5')));
}
}
void addProjectConfigFileInclude()
{
if (!m_projectPart->projectConfigFile.isEmpty()) {
add(QLatin1String("-include"));
add(m_projectPart->projectConfigFile);
}
}
void addExtraOptions()
{
add(QLatin1String("-fmessage-length=0"));
add(QLatin1String("-fdiagnostics-show-note-include-stack"));
add(QLatin1String("-fmacro-backtrace-limit=0"));
add(QLatin1String("-fretain-comments-from-system-headers"));
// TODO: -Xclang -ferror-limit -Xclang 0 ?
}
}; };
/** /**