diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-15 10:07:49 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-15 10:07:55 +0200 |
| commit | 8a77eacf8d8c8f4877105e4758c7e587d01b4d83 (patch) | |
| tree | f67167a3c1c5f63cde88d38a3606d90e567f6274 /src/plugins/cpptools/compileroptionsbuilder.h | |
| parent | 0338f6909c5ca5f265018304b15227530ba787e0 (diff) | |
| parent | 7080645d20adc20a025b99ccd116575901165af5 (diff) | |
| download | qt-creator-8a77eacf8d8c8f4877105e4758c7e587d01b4d83.tar.gz | |
Merge remote-tracking branch 'origin/4.0'
Change-Id: Ied609608f6b12aa923c67777bc5a273c4d8fbcbb
Diffstat (limited to 'src/plugins/cpptools/compileroptionsbuilder.h')
| -rw-r--r-- | src/plugins/cpptools/compileroptionsbuilder.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.h b/src/plugins/cpptools/compileroptionsbuilder.h index ebd2e789a8..f24105f2f2 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.h +++ b/src/plugins/cpptools/compileroptionsbuilder.h @@ -45,11 +45,15 @@ public: // Add options based on project part virtual void addTargetTriple(); + virtual void enableExceptions(); void addHeaderPathOptions(); void addToolchainAndProjectDefines(); virtual void addLanguageOption(ProjectFile::Kind fileKind); virtual void addOptionsForLanguage(bool checkForBorlandExtensions = true); + void addMsvcCompatibilityVersion(); + void undefineCppLanguageFeatureMacrosForMsvc2015(); + protected: virtual bool excludeDefineLine(const QByteArray &defineLine) const; virtual bool excludeHeaderPath(const QString &headerPath) const; |