summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2019-12-03 11:53:32 +0100
committerLars Knoll <lars.knoll@qt.io>2020-02-08 09:49:07 +0100
commit4933a5f89231afd64b1604d47220e1ff34d2c448 (patch)
tree8e62e43d5bec1bc749635d0a28899257a82d5976 /qmake
parent3568ad58f5e273d60f089a1b2d8c91c9535c8cad (diff)
Use C++17 for qmake and force the build of everything with C++17
We will want to use C++17 code in our headers soon. (including the one in the bootstrap libraries) This patch is quick and dirty, I guess it will be cleaner once we move to cmake Updated QMAKE_MACOSX_DEPLOYMENT_TARGET because 10.13 runtime does not support C++17 stdlib features Change-Id: I75ac171436945dddd1bb953a9c8d323ac20da7ac Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/Makefile.win322
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
index 6f27b735d4..20644595d2 100644
--- a/qmake/Makefile.win32
+++ b/qmake/Makefile.win32
@@ -28,7 +28,7 @@ CFLAGS_PCH = -Yuqmake_pch.h -FIqmake_pch.h -Fpqmake_pch.pch
PCH_OBJECT = qmake_pch.obj
CFLAGS_BARE = -c -Fo./ -Fdqmake.pdb \
- -W2 -nologo -O2 \
+ -W2 -nologo -O2 -std:c++17 -Zc:__cplusplus \
$(CFLAGS_EXTRA) \
-I$(QMKSRC) -I$(QMKSRC)\library -I$(QMKSRC)\generators -I$(QMKSRC)\generators\unix -I$(QMKSRC)\generators\win32 -I$(QMKSRC)\generators\mac \
-I$(SOURCE_PATH)/src/3rdparty/tinycbor/src \