From 1293972514b10cd7a5ca6435646c496bb427e305 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Wed, 10 Jun 2020 11:33:36 +0200
Subject: 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.
---
 libquotient.pri | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'libquotient.pri')

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=.) {
-- 
cgit v1.2.3