summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2018-10-10 15:32:43 +0200
committerKai Koehne <kai.koehne@qt.io>2018-10-15 06:47:42 +0000
commit452246871660e17033ec5f0faab59f53273728e2 (patch)
tree69a8b8aded09469328164c9d032ddaf5be48ae53 /mkspecs
parent52070f3a6c1bc65b9be9187c856291451d275d64 (diff)
qmake: Add support for CONFIG += c++17
The correct name is c++1z. Anyhow, this is easy enough to get wrong, so make sure CONFIG += c++17 works as well. Task-number: QTBUG-67527 Change-Id: Iea26b18824b38b1b5170f85987cf5c750b8e10ab Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: André Hartmann <aha_1980@gmx.de>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/default_post.prf2
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
index ad4a5f6365..fbf1f3b8df 100644
--- a/mkspecs/features/default_post.prf
+++ b/mkspecs/features/default_post.prf
@@ -113,6 +113,8 @@ breakpad {
!isEmpty(QMAKE_STRIP):QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$quote($$QMAKE_STRIP $$DEBUGFILENAME)
}
+c++17: CONFIG += c++1z
+
!c++11:!c++14:!c++1z {
# Qt requires C++11 since 5.7, check if we need to force a compiler option
QT_COMPILER_STDCXX_no_L = $$replace(QT_COMPILER_STDCXX, "L$", "")