diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2018-11-30 12:15:07 +0100 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2018-12-04 14:57:20 +0000 |
| commit | c7c800a73e61c743da6e05bcdbc5c06169805726 (patch) | |
| tree | 578aace15e3c9a07bb4cd7eeb5a756ac218018cd /src/plugins/cpptools/compileroptionsbuilder.cpp | |
| parent | e57c1268ee302bd78059a13a046eade9d896c61e (diff) | |
| download | qt-creator-c7c800a73e61c743da6e05bcdbc5c06169805726.tar.gz | |
CppTools: Split CppTools::UseBuiltin in two options
...for clarity.
No behavior change.
Change-Id: Id0334bc79b97a8ff53b37089e337530c9a01b1d4
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'src/plugins/cpptools/compileroptionsbuilder.cpp')
| -rw-r--r-- | src/plugins/cpptools/compileroptionsbuilder.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index d5a3a53043..349affe69f 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -73,13 +73,15 @@ static QString defineDirectiveToDefineOption(const ProjectExplorer::Macro ¯o CompilerOptionsBuilder::CompilerOptionsBuilder(const ProjectPart &projectPart, UseSystemHeader useSystemHeader, - UseBuiltin useBuiltInHeaderPathsAndDefines, + UseToolchainMacros useToolchainMacros, + UseTweakedHeaderPaths useTweakedHeaderPaths, UseLanguageDefines useLanguageDefines, const QString &clangVersion, const QString &clangResourceDirectory) : m_projectPart(projectPart) , m_useSystemHeader(useSystemHeader) - , m_useBuiltInHeaderPathsAndDefines(useBuiltInHeaderPathsAndDefines) + , m_useToolchainMacros(useToolchainMacros) + , m_useTweakedHeaderPaths(useTweakedHeaderPaths) , m_useLanguageDefines(useLanguageDefines) , m_clangVersion(clangVersion) , m_clangResourceDirectory(clangResourceDirectory) @@ -279,7 +281,7 @@ static int includeIndexForResourceDirectory(const QStringList &options, bool isM void CompilerOptionsBuilder::insertWrappedQtHeaders() { - if (m_useBuiltInHeaderPathsAndDefines == UseBuiltin::No) + if (m_useTweakedHeaderPaths == UseTweakedHeaderPaths::No) return; QStringList wrappedQtHeaders; @@ -343,7 +345,7 @@ void CompilerOptionsBuilder::addHeaderPathOptions() m_options.append(includes); m_options.append(systemIncludes); - if (m_useBuiltInHeaderPathsAndDefines == UseBuiltin::No) + if (m_useTweakedHeaderPaths == UseTweakedHeaderPaths::No) return; // Exclude all built-in includes except Clang resource directory. @@ -391,7 +393,7 @@ void CompilerOptionsBuilder::addPrecompiledHeaderOptions(UsePrecompiledHeaders u void CompilerOptionsBuilder::addToolchainAndProjectMacros() { - if (m_useBuiltInHeaderPathsAndDefines == UseBuiltin::Yes) + if (m_useToolchainMacros == UseToolchainMacros::Yes) addMacros(m_projectPart.toolChainMacros); addMacros(m_projectPart.projectMacros); } @@ -673,7 +675,7 @@ void CompilerOptionsBuilder::addToolchainFlags() // In case of MSVC we need builtin clang defines to correctly handle clang includes if (m_projectPart.toolchainType != ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID && m_projectPart.toolchainType != ProjectExplorer::Constants::CLANG_CL_TOOLCHAIN_TYPEID) { - if (m_useBuiltInHeaderPathsAndDefines == UseBuiltin::Yes) + if (m_useToolchainMacros == UseToolchainMacros::Yes) add("-undef"); else add("-fPIC"); |