From 0d07725f6beb7916a46a01e067e3c7303d0a0b85 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Fri, 10 Nov 2023 11:17:16 +0100 Subject: [PATCH] Fix the broken condition of -fno-reorder-blocks-and-partition flag in QtGui The condition was wrongly converted while qmake-to-cmake porting. Pick-to: 6.2 6.5 6.6 Change-Id: I8b8de7c9b2ca079609ed466cf91f1a3dd0d22aa9 Reviewed-by: Alexandru Croitor --- src/gui/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index e848ac23c3..eb574fd9d6 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -573,7 +573,10 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_png WrapPNG::WrapPNG ) -qt_internal_extend_target(Gui CONDITION ((QT_FEATURE_png) AND (WIN32 AND MINGW)) AND (GCC_VERSION___equals___8.1.0) +qt_internal_extend_target(Gui + CONDITION + QT_FEATURE_png AND WIN32 AND MINGW AND + (CMAKE_CXX_COMPILER_VESION VERSION_EQUAL "8.1.0") COMPILE_OPTIONS -fno-reorder-blocks-and-partition )