diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-11-30 16:14:32 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-11-30 16:14:32 +0100 |
| commit | d02afbe6b4105fb43dc6c3f6171a7bedfa73c0a5 (patch) | |
| tree | 109f41808dabd4c83b3cb519800cee0879dcf5f6 /src/plugins/projectexplorer/gcctoolchain.h | |
| parent | 51fd8f5f70af58c79add15bb83d26b15d6e893a0 (diff) | |
| parent | 43c73b20e48330f428aa9dba7e1fa37742354671 (diff) | |
| download | qt-creator-d02afbe6b4105fb43dc6c3f6171a7bedfa73c0a5.tar.gz | |
Merge remote-tracking branch 'origin/4.14'
Conflicts:
src/plugins/projectexplorer/gcctoolchain.cpp
Change-Id: I2136ba89d3aa3c4c2a0e7a4f9d8ba9cec32924ce
Diffstat (limited to 'src/plugins/projectexplorer/gcctoolchain.h')
| -rw-r--r-- | src/plugins/projectexplorer/gcctoolchain.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/plugins/projectexplorer/gcctoolchain.h b/src/plugins/projectexplorer/gcctoolchain.h index 0c310c2890..4ae34fb402 100644 --- a/src/plugins/projectexplorer/gcctoolchain.h +++ b/src/plugins/projectexplorer/gcctoolchain.h @@ -83,12 +83,7 @@ public: const QString &directoryPath) const override; MacroInspectionRunner createMacroInspectionRunner() const override; - Macros predefinedMacros(const QStringList &cxxflags) const override; - BuiltInHeaderPathsRunner createBuiltInHeaderPathsRunner(const Utils::Environment &env) const override; - HeaderPaths builtInHeaderPaths(const QStringList &flags, - const Utils::FilePath &sysRootPath, - const Utils::Environment &env) const override; void addToEnvironment(Utils::Environment &env) const override; Utils::FilePath makeCommand(const Utils::Environment &environment) const override; |