From a578a09a418c689c9c9a43152961288ad075471b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Matysiak?= Date: Tue, 23 Jul 2024 12:53:09 +0200 Subject: [PATCH] Prevent -feature-c++20 on VxWorks The way that Qt checks if C++20 is supported by the platform does not work properly on VxWorks. Their toolchain accepts the C++20 switch, because they use clang with a wrapper around it, that (for the time being) does not reject it. The compiler itself claims that it does support C++20. The problem is that the standard library available on VxWorks only supports C++17. This leads to Qt falsely believing that C++20 is supported. This is being discussed as a defect in support case 00152044. Prevent weird compilation errors by failing early if the user passes -feature-c++20 to the configure call. Task-number: QTBUG-115777 Pick-to: 6.7 6.8 Change-Id: Ica6686428b01a0638117f853586313be63e5fe99 Reviewed-by: Alexandru Croitor --- configure.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.cmake b/configure.cmake index c4fd0b388e2..e61a49ac82d 100644 --- a/configure.cmake +++ b/configure.cmake @@ -736,7 +736,7 @@ qt_feature_config("plugin-manifests" QMAKE_PUBLIC_CONFIG qt_feature("c++20" PUBLIC LABEL "C++20" AUTODETECT OFF - CONDITION TEST_cxx20 + CONDITION TEST_cxx20 AND NOT VXWORKS ) qt_feature_config("c++20" QMAKE_PUBLIC_QT_CONFIG) qt_feature("c++2a" PUBLIC