From 7764169aa33a308a775d2f42b37d6ac08ba8ac0a Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Wed, 18 May 2022 13:37:13 +0800 Subject: [PATCH] Disallow narrowing conversions in signal connection --- cmake/Modules/MacroQbtCommonConfig.cmake | 1 + src/src.pro | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cmake/Modules/MacroQbtCommonConfig.cmake b/cmake/Modules/MacroQbtCommonConfig.cmake index 36bbc7d36..e703437f4 100644 --- a/cmake/Modules/MacroQbtCommonConfig.cmake +++ b/cmake/Modules/MacroQbtCommonConfig.cmake @@ -21,6 +21,7 @@ macro(qbt_common_config) QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_BYTEARRAY + QT_NO_NARROWING_CONVERSIONS_IN_CONNECT QT_USE_QSTRINGBUILDER QT_STRICT_ITERATORS $<$>:QT_NO_DEBUG_OUTPUT> diff --git a/src/src.pro b/src/src.pro index 3291793f6..dc164a5e2 100644 --- a/src/src.pro +++ b/src/src.pro @@ -61,12 +61,14 @@ CONFIG(release, debug|release) { include(../version.pri) # Qt defines -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050f02 -DEFINES += QT_NO_CAST_FROM_ASCII -DEFINES += QT_NO_CAST_TO_ASCII -DEFINES += QT_NO_CAST_FROM_BYTEARRAY -DEFINES += QT_USE_QSTRINGBUILDER -DEFINES += QT_STRICT_ITERATORS +DEFINES += \ + QT_DISABLE_DEPRECATED_BEFORE=0x050f02 \ + QT_NO_CAST_FROM_ASCII \ + QT_NO_CAST_TO_ASCII \ + QT_NO_CAST_FROM_BYTEARRAY \ + QT_NO_NARROWING_CONVERSIONS_IN_CONNECT \ + QT_USE_QSTRINGBUILDER \ + QT_STRICT_ITERATORS INCLUDEPATH += $$PWD