aboutsummaryrefslogtreecommitdiff
path: root/libquotient.pri
diff options
context:
space:
mode:
authorKitsune Ral <Kitsune-Ral@users.sf.net>2020-06-10 11:33:36 +0200
committerKitsune Ral <Kitsune-Ral@users.sf.net>2020-06-10 15:06:47 +0200
commit1293972514b10cd7a5ca6435646c496bb427e305 (patch)
treeb0a28cfd60fd258d1e9feedcc7a13f6d064e15f5 /libquotient.pri
parentf3b8dbe01a43c5334a371edda833173468d99dc4 (diff)
downloadlibquotient-1293972514b10cd7a5ca6435646c496bb427e305.tar.gz
libquotient-1293972514b10cd7a5ca6435646c496bb427e305.zip
libquotient.pri: set /std:c++17 explicitly
Qt 5.9's qmake only seems to use CONFIG *= c++1z for GCC/LLVM but not for MSVC.
Diffstat (limited to 'libquotient.pri')
-rw-r--r--libquotient.pri5
1 files changed, 3 insertions, 2 deletions
diff --git a/libquotient.pri b/libquotient.pri
index 494a163a..68e7b590 100644
--- a/libquotient.pri
+++ b/libquotient.pri
@@ -7,9 +7,10 @@ CONFIG *= c++1z warn_on rtti_off create_prl object_parallel_to_source
win32-msvc* {
# Quotient code base does not play well with NMake inference rules
CONFIG *= no_batch
- QMAKE_CXXFLAGS_WARN_ON += -wd4100 -wd4267
+ QMAKE_CXXFLAGS_WARN_ON *= -wd4100 -wd4267
+ QMAKE_CXXFLAGS *= /std:c++17 # Older Qt doesn't understand c++1z above
} else {
- QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter
+ QMAKE_CXXFLAGS_WARN_ON *= -Wno-unused-parameter
}
contains(DEFINES, Quotient_E2EE_ENABLED=.) {