From ca61c10347e7a382ab92b09d02308903feb4ee7c Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Sat, 15 Jul 2023 19:42:36 +0300 Subject: Build with QT_NO_CONTEXTLESS_CONNECT This disables the 3-arg QObject::connect() overload: QObject::connect(sender, signal, functor) For details see: https://lists.qt-project.org/pipermail/development/2023-July/044141.html Change-Id: I9e068cacae63f4a5594d712c4fbff25e380da55c Reviewed-by: Qt CI Bot Reviewed-by: Juha Vuolle --- src/plugins/sensors/android/CMakeLists.txt | 1 + src/plugins/sensors/dummy/CMakeLists.txt | 2 ++ src/plugins/sensors/generic/CMakeLists.txt | 1 + src/plugins/sensors/iio-sensor-proxy/CMakeLists.txt | 2 ++ src/plugins/sensors/ios/CMakeLists.txt | 2 ++ src/plugins/sensors/sensorfw/CMakeLists.txt | 2 ++ src/plugins/sensors/winrt/CMakeLists.txt | 2 ++ src/sensors/CMakeLists.txt | 1 + src/sensorsquick/CMakeLists.txt | 1 + 9 files changed, 14 insertions(+) diff --git a/src/plugins/sensors/android/CMakeLists.txt b/src/plugins/sensors/android/CMakeLists.txt index 9a77a9a5..69e76f51 100644 --- a/src/plugins/sensors/android/CMakeLists.txt +++ b/src/plugins/sensors/android/CMakeLists.txt @@ -25,6 +25,7 @@ qt_internal_add_plugin(AndroidSensorPlugin # STATICPLUGIN needed because there's a Q_IMPORT_PLUGIN in main.cpp # Yes, the plugin imports itself statically QT_STATICPLUGIN + QT_NO_CONTEXTLESS_CONNECT LIBRARIES Qt::CorePrivate Qt::Sensors diff --git a/src/plugins/sensors/dummy/CMakeLists.txt b/src/plugins/sensors/dummy/CMakeLists.txt index 19f93329..1ba16ec5 100644 --- a/src/plugins/sensors/dummy/CMakeLists.txt +++ b/src/plugins/sensors/dummy/CMakeLists.txt @@ -13,6 +13,8 @@ qt_internal_add_plugin(dummySensorPlugin dummycommon.cpp dummycommon.h dummylightsensor.cpp dummylightsensor.h main.cpp + DEFINES + QT_NO_CONTEXTLESS_CONNECT LIBRARIES Qt::Core Qt::Sensors diff --git a/src/plugins/sensors/generic/CMakeLists.txt b/src/plugins/sensors/generic/CMakeLists.txt index 449401ab..659fbe2d 100644 --- a/src/plugins/sensors/generic/CMakeLists.txt +++ b/src/plugins/sensors/generic/CMakeLists.txt @@ -17,6 +17,7 @@ qt_internal_add_plugin(genericSensorPlugin QTSENSORS_GENERICALSSENSOR QTSENSORS_GENERICORIENTATIONSENSOR QTSENSORS_GENERICTILTSENSOR + QT_NO_CONTEXTLESS_CONNECT LIBRARIES Qt::Core Qt::Sensors diff --git a/src/plugins/sensors/iio-sensor-proxy/CMakeLists.txt b/src/plugins/sensors/iio-sensor-proxy/CMakeLists.txt index 83093e11..d675ba9b 100644 --- a/src/plugins/sensors/iio-sensor-proxy/CMakeLists.txt +++ b/src/plugins/sensors/iio-sensor-proxy/CMakeLists.txt @@ -14,6 +14,8 @@ qt_internal_add_plugin(IIOSensorProxySensorPlugin iiosensorproxyorientationsensor.cpp iiosensorproxyorientationsensor.h iiosensorproxysensorbase.cpp iiosensorproxysensorbase.h main.cpp + DEFINES + QT_NO_CONTEXTLESS_CONNECT NO_UNITY_BUILD_SOURCES # Duplicate symbol definition between, iiosensorproxycompass.cpp, and # the followings diff --git a/src/plugins/sensors/ios/CMakeLists.txt b/src/plugins/sensors/ios/CMakeLists.txt index 44f61427..26f15963 100644 --- a/src/plugins/sensors/ios/CMakeLists.txt +++ b/src/plugins/sensors/ios/CMakeLists.txt @@ -10,6 +10,8 @@ qt_internal_add_plugin(IOSSensorPlugin PLUGIN_TYPE sensors SOURCES main.mm + DEFINES + QT_NO_CONTEXTLESS_CONNECT LIBRARIES ${FWFoundation} Qt::Core diff --git a/src/plugins/sensors/sensorfw/CMakeLists.txt b/src/plugins/sensors/sensorfw/CMakeLists.txt index cc5e9dad..9de87fc4 100644 --- a/src/plugins/sensors/sensorfw/CMakeLists.txt +++ b/src/plugins/sensors/sensorfw/CMakeLists.txt @@ -23,6 +23,8 @@ qt_internal_add_plugin(sensorfwSensorPlugin sensorfwrotationsensor.cpp sensorfwrotationsensor.h sensorfwsensorbase.cpp sensorfwsensorbase.h sensorfwtapsensor.cpp sensorfwtapsensor.h + DEFINES + QT_NO_CONTEXTLESS_CONNECT LIBRARIES Qt::Core Qt::DBus diff --git a/src/plugins/sensors/winrt/CMakeLists.txt b/src/plugins/sensors/winrt/CMakeLists.txt index 78baef86..0fd92ebf 100644 --- a/src/plugins/sensors/winrt/CMakeLists.txt +++ b/src/plugins/sensors/winrt/CMakeLists.txt @@ -17,6 +17,8 @@ qt_internal_add_plugin(WinRtSensorPlugin winrtgyroscope.cpp winrtgyroscope.h winrtorientationsensor.cpp winrtorientationsensor.h winrtrotationsensor.cpp winrtrotationsensor.h + DEFINES + QT_NO_CONTEXTLESS_CONNECT LIBRARIES Qt::Core Qt::CorePrivate diff --git a/src/sensors/CMakeLists.txt b/src/sensors/CMakeLists.txt index 6d883696..75884f5c 100644 --- a/src/sensors/CMakeLists.txt +++ b/src/sensors/CMakeLists.txt @@ -66,6 +66,7 @@ qt_internal_add_module(Sensors qlidsensor.cpp DEFINES $<$:ENABLE_RUNTIME_SENSORLOG> + QT_NO_CONTEXTLESS_CONNECT LIBRARIES Qt::CorePrivate PUBLIC_LIBRARIES diff --git a/src/sensorsquick/CMakeLists.txt b/src/sensorsquick/CMakeLists.txt index 29552a81..715433f3 100644 --- a/src/sensorsquick/CMakeLists.txt +++ b/src/sensorsquick/CMakeLists.txt @@ -27,6 +27,7 @@ qt_internal_add_qml_module(SensorsQuick qsensorsquickglobal_p.h DEFINES QT_BUILD_SENSORSQUICK_LIB + QT_NO_CONTEXTLESS_CONNECT DEPENDENCIES QtQml PUBLIC_LIBRARIES -- cgit v1.2.3