From 8ccd38d20dfe4d9b359d54d3b308fc3234b9c815 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 11 Apr 2017 14:18:42 -0700 Subject: Move Apple-specific -fapplication-extensions option to the mkspec The Intel compiler does not know about it. Change-Id: I523b0abacd5148b2bf08fffd14b4748c3b33c8fb Reviewed-by: Jake Petroules --- mkspecs/common/clang-mac.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mkspecs/common') diff --git a/mkspecs/common/clang-mac.conf b/mkspecs/common/clang-mac.conf index 274fd73d00..cbae2e6262 100644 --- a/mkspecs/common/clang-mac.conf +++ b/mkspecs/common/clang-mac.conf @@ -9,3 +9,5 @@ QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvm.clang.1_0 QMAKE_CXXFLAGS += -stdlib=libc++ QMAKE_LFLAGS += -stdlib=libc++ QMAKE_AR_LTCG = libtool -static -o + +QMAKE_CFLAGS_APPLICATION_EXTENSION = -fapplication-extension -- cgit v1.2.3 From 255d291efd5ed3e193a6340055c35887f687f0ca Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 13 Mar 2017 22:56:27 -0700 Subject: MSVC: Enable standards-conforming mode Let's not allow any new code that uses non-conforming syntaxes. With GCC and like, we already use -std=c++11 instead of -std=gnu++11 for that very reason. Change-Id: I4a7dc1fe14154695b968fffd14aba9f8cea69c47 Reviewed-by: Friedemann Kleint Reviewed-by: Oswald Buddenhagen Reviewed-by: Oliver Wolff --- mkspecs/common/msvc-version.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mkspecs/common') diff --git a/mkspecs/common/msvc-version.conf b/mkspecs/common/msvc-version.conf index 945767ce8c..29f96b7abf 100644 --- a/mkspecs/common/msvc-version.conf +++ b/mkspecs/common/msvc-version.conf @@ -47,7 +47,7 @@ greaterThan(QMAKE_MSC_VER, 1799) { MSVC_VER = 12.0 COMPAT_MKSPEC = win32-msvc2013 QMAKE_CFLAGS += -FS - QMAKE_CXXFLAGS += -FS + QMAKE_CXXFLAGS += -FS -Zc:rvalueCast -Zc:inline QMAKE_CFLAGS_F16C = -arch:AVX @@ -80,6 +80,7 @@ greaterThan(QMAKE_MSC_VER, 1909) { # Visual Studio 2017 (15.0) / Visual C++ 19.10 and up MSVC_VER = 15.0 COMPAT_MKSPEC = win32-msvc2017 + QMAKE_CXXFLAGS += -Zc:referenceBinding } greaterThan(QMAKE_MSC_VER, 1910) { -- cgit v1.2.3