diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-12 10:43:10 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-12 11:34:46 +0200 |
| commit | 5c874322603444ef02bd578ae302c03a9b1cd034 (patch) | |
| tree | 6339db7c3a2683e18208e75895444f2d2d251ebe /src/plugins/cpptools/compileroptionsbuilder.h | |
| parent | 04acb9d643060811dbba8f66d807b2a7574c3a6f (diff) | |
| parent | 8dadafb9e0a2fbb49ab08b9eea0ff307088ba3f8 (diff) | |
| download | qt-creator-5c874322603444ef02bd578ae302c03a9b1cd034.tar.gz | |
Merge remote-tracking branch 'origin/4.0'
Conflicts:
src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
Change-Id: I6ae2d37290643d69390f679a54f7596782f3d97f
Diffstat (limited to 'src/plugins/cpptools/compileroptionsbuilder.h')
| -rw-r--r-- | src/plugins/cpptools/compileroptionsbuilder.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.h b/src/plugins/cpptools/compileroptionsbuilder.h index e83d15f2c1..ebd2e789a8 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.h +++ b/src/plugins/cpptools/compileroptionsbuilder.h @@ -44,6 +44,7 @@ public: void addDefine(const QByteArray &defineLine); // Add options based on project part + virtual void addTargetTriple(); void addHeaderPathOptions(); void addToolchainAndProjectDefines(); virtual void addLanguageOption(ProjectFile::Kind fileKind); |