From 49cf0b94597ce41484c130c3d3666de9e25cfe30 Mon Sep 17 00:00:00 2001
From: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Date: Mon, 11 Oct 2021 14:45:00 +0200
Subject: [PATCH] Re-enable QT_NO_NARROWING_CONVERSIONS_IN_CONNECT for Qt

This define used to be set for the entirety of the Qt build but
was lost during the qmake->CMake transition. Re-enable it.

Change-Id: Idc4cb6ada485158559485b60f62f76439550b255
Pick-to: 6.2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
 cmake/QtInternalTargets.cmake                     | 1 +
 tests/auto/corelib/kernel/qobject/tst_qobject.cpp | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/cmake/QtInternalTargets.cmake b/cmake/QtInternalTargets.cmake
index ea4157a8ba..7cc340d381 100644
--- a/cmake/QtInternalTargets.cmake
+++ b/cmake/QtInternalTargets.cmake
@@ -131,6 +131,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND CMAKE_SYSTEM_NAME STREQUAL "
     target_compile_options(PlatformCommonInternal INTERFACE -Wno-ignored-attributes)
 endif()
 
+target_compile_definitions(PlatformCommonInternal INTERFACE QT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
 target_compile_definitions(PlatformCommonInternal INTERFACE $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>)
 
 function(qt_internal_apply_bitcode_flags target)
diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
index a06bb5caab..d5dbb7e1fc 100644
--- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
+++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
@@ -27,6 +27,11 @@
 **
 ****************************************************************************/
 
+// This test actually wants to practice narrowing conditions, so never define this.
+#ifdef QT_NO_NARROWING_CONVERSIONS_IN_CONNECT
+#undef QT_NO_NARROWING_CONVERSIONS_IN_CONNECT
+#endif
+
 #include <QTest>
 #include <QtTest/private/qpropertytesthelper_p.h>
 #include <QStringListModel>