From 1cb63fcc97e2b114996e25e679b167cb5d392c60 Mon Sep 17 00:00:00 2001
From: Alexey Edelev <alexey.edelev@qt.io>
Date: Thu, 24 Jun 2021 14:18:28 +0200
Subject: [PATCH] Disable forced full optimization if
 QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS=ON

Pick-to: 6.2
Task-number: QTBUG-94753
Change-Id: Ib9dda1a96f3123394e3b3d4f84feac8cedd18b89
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 cmake/QtFlagHandlingHelpers.cmake | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake
index 4679a00a1aa..dc81a793337 100644
--- a/cmake/QtFlagHandlingHelpers.cmake
+++ b/cmake/QtFlagHandlingHelpers.cmake
@@ -671,6 +671,11 @@ function(qt_internal_add_optimize_full_flags)
         ""
         ${ARGN})
 
+    # QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS disables forced full optimization.
+    if(QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS)
+        return()
+    endif()
+
     # Assume that FEATURE_optimize_full has higher priority. But if FEATURE_optimize_full is OFF,
     # flags are set by FEATURE_optimize_size should remain unchanged.
     if(QT_FEATURE_optimize_size AND NOT QT_FEATURE_optimize_full)