diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-11-19 15:38:13 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-11-19 15:38:13 +0100 |
| commit | 5ca70bdcb3e76268a2e69466b403b6e4b9516afd (patch) | |
| tree | 95caf64d08ea53410f45578c3e1e2d22e415d1c3 /src/plugins/cpptools/compileroptionsbuilder.cpp | |
| parent | b2690664357cdb2cb6cd6380f608abedd58b0b9f (diff) | |
| parent | 9b6944086b53d34645bc81953c5f9a28ca9f3ed8 (diff) | |
| download | qt-creator-5ca70bdcb3e76268a2e69466b403b6e4b9516afd.tar.gz | |
Merge remote-tracking branch 'origin/4.14'
Change-Id: Iea84f23cf394de13e99a9ed777c8c113e4eff473
Diffstat (limited to 'src/plugins/cpptools/compileroptionsbuilder.cpp')
| -rw-r--r-- | src/plugins/cpptools/compileroptionsbuilder.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index 0fe9deb7d1..548594fedc 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -596,6 +596,7 @@ static QStringList languageFeatureMacros() "__cpp_binary_literals", "__cpp_capture_star_this", "__cpp_constexpr", + "__cpp_constexpr_in_decltype", "__cpp_decltype", "__cpp_decltype_auto", "__cpp_deduction_guides", |