From aad32df58541fa42ce887816c3234f9b2d5c9347 Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Sun, 20 Jan 2019 17:07:43 +0100 Subject: [PATCH] try to fix C++1-issues for VisualStudio --- examples/test_multiplot/test_multiplot.pro | 10 +++++++++- lib/common.pri | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/examples/test_multiplot/test_multiplot.pro b/examples/test_multiplot/test_multiplot.pro index 8817125fca..af4acdc7cb 100644 --- a/examples/test_multiplot/test_multiplot.pro +++ b/examples/test_multiplot/test_multiplot.pro @@ -21,7 +21,15 @@ CONFIG (debug, debug|release) { } message("LIBS = $$LIBS") -win32-msvc*: DEFINES += _USE_MATH_DEFINES +win32-msvc* { + QMAKE_CXXFLAGS += /EHsc /std:c++14 + # To enable M_PI, M_E,... + DEFINES += _USE_MATH_DEFINES + # To fix error: C2338: va_start argument must not + # have reference type and must not be parenthesized + DEFINES += _CRT_NO_VA_START_VALIDATION +} + # here you can activate some debug options #DEFINES += SHOW_JKQTPLOTTER_DEBUG diff --git a/lib/common.pri b/lib/common.pri index 2811015a69..694e674a6a 100644 --- a/lib/common.pri +++ b/lib/common.pri @@ -2,7 +2,7 @@ !win32-msvc* { QMAKE_CXXFLAGS += -fexceptions } else { - QMAKE_CXXFLAGS += /EHsc + QMAKE_CXXFLAGS += /EHsc /std:c++14 # To enable M_PI, M_E,... DEFINES += _USE_MATH_DEFINES # To fix error: C2338: va_start argument must not