From 8780fbb2ebff82f6e9b2dbae9a523d094d327b32 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Thu, 8 Oct 2020 22:29:04 +0200 Subject: Build Qt (and client apps using it) with /permissive- *Not* using /permissive- exposes Qt and client apps to interesting bugs and/or build failures, (e.g. QTBUG-87225, or 19b5520abfb5f66d4b83c7a18cc72d68673d098a). We demand strict conformance by any other compiler, it's time to demand it from MSVC too. The Windows headers themselves are clean starting from the Windows Fall Creators SDK (10.0.16299.0), and moreover Qt 6 will drop WinRT; therefore, the comment in the mkspecs does not apply any more. Since /permissive- implies /Zc:referenceBinding, drop that option. The other implied options are set on MSVC < 2017, but I leave them in to avoid tinkering with the fragile lists of C/C++ flags. Rename the CMake internal helper function to better describe what it does. Fixes: QTBUG-85633 Fixes: QTBUG-85637 Fixes: QTBUG-85635 Fixes: QTBUG-88244 Change-Id: Ie03fddb61aa066fdc14b7231c22e7108b4a02fbb Reviewed-by: Friedemann Kleint Reviewed-by: Kai Koehne Reviewed-by: Volker Hilsheimer --- qmake/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qmake') diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index 0dc9d5f03c..133472b78d 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -275,7 +275,7 @@ set_target_properties(${target_name} PROPERTIES qt_internal_apply_gc_binaries(${target_name} PRIVATE) # special case -qt_enable_msvc_cplusplus_define(${target_name} PUBLIC) # special case +qt_set_msvc_cplusplus_options(${target_name} PUBLIC) # special case qt_skip_warnings_are_errors(${target_name}) # special case qt_internal_apply_intel_cet(Bootstrap PUBLIC) # special case -- cgit v1.2.3