diff options
author | Ahmad Samir <a.samirh78@gmail.com> | 2023-08-22 18:41:23 +0300 |
---|---|---|
committer | Ahmad Samir <a.samirh78@gmail.com> | 2023-08-23 14:32:55 +0300 |
commit | fd6a895afb15b3275b1ad64c26ed0c581ffcac2e (patch) | |
tree | 0f435f32676bd0d5f496b4bf3373cc88a114bc07 | |
parent | d007b3df1cbd18ed108392150d05d54e2f2cd9e7 (diff) |
Mark the whole repo with QT_NO_CONTEXTLESS_CONNECT
By adding it to the default build flags via .cmake.conf.
This amends commit 2c723b6af7ac6c359916dcd240b1f57057871321.
Task-number: QTBUG-116296
Change-Id: Ic485c2f4596f77f59928df960050421d2d08748f
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
-rw-r--r-- | .cmake.conf | 1 | ||||
-rw-r--r-- | src/plugins/sensors/android/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/plugins/sensors/dummy/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/sensors/generic/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/plugins/sensors/iio-sensor-proxy/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/sensors/ios/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/sensors/sensorfw/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/sensors/winrt/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/sensors/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/sensorsquick/CMakeLists.txt | 1 |
10 files changed, 1 insertions, 14 deletions
diff --git a/.cmake.conf b/.cmake.conf index 734bc2d5..64c98460 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -2,3 +2,4 @@ set(QT_REPO_MODULE_VERSION "6.7.0") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") +list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_CONTEXTLESS_CONNECT=1") diff --git a/src/plugins/sensors/android/CMakeLists.txt b/src/plugins/sensors/android/CMakeLists.txt index 69e76f51..9a77a9a5 100644 --- a/src/plugins/sensors/android/CMakeLists.txt +++ b/src/plugins/sensors/android/CMakeLists.txt @@ -25,7 +25,6 @@ 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 1ba16ec5..19f93329 100644 --- a/src/plugins/sensors/dummy/CMakeLists.txt +++ b/src/plugins/sensors/dummy/CMakeLists.txt @@ -13,8 +13,6 @@ 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 659fbe2d..449401ab 100644 --- a/src/plugins/sensors/generic/CMakeLists.txt +++ b/src/plugins/sensors/generic/CMakeLists.txt @@ -17,7 +17,6 @@ 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 d675ba9b..83093e11 100644 --- a/src/plugins/sensors/iio-sensor-proxy/CMakeLists.txt +++ b/src/plugins/sensors/iio-sensor-proxy/CMakeLists.txt @@ -14,8 +14,6 @@ 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 26f15963..44f61427 100644 --- a/src/plugins/sensors/ios/CMakeLists.txt +++ b/src/plugins/sensors/ios/CMakeLists.txt @@ -10,8 +10,6 @@ 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 9de87fc4..cc5e9dad 100644 --- a/src/plugins/sensors/sensorfw/CMakeLists.txt +++ b/src/plugins/sensors/sensorfw/CMakeLists.txt @@ -23,8 +23,6 @@ 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 0fd92ebf..78baef86 100644 --- a/src/plugins/sensors/winrt/CMakeLists.txt +++ b/src/plugins/sensors/winrt/CMakeLists.txt @@ -17,8 +17,6 @@ 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 75884f5c..6d883696 100644 --- a/src/sensors/CMakeLists.txt +++ b/src/sensors/CMakeLists.txt @@ -66,7 +66,6 @@ qt_internal_add_module(Sensors qlidsensor.cpp DEFINES $<$<CONFIG:Debug>: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 715433f3..29552a81 100644 --- a/src/sensorsquick/CMakeLists.txt +++ b/src/sensorsquick/CMakeLists.txt @@ -27,7 +27,6 @@ qt_internal_add_qml_module(SensorsQuick qsensorsquickglobal_p.h DEFINES QT_BUILD_SENSORSQUICK_LIB - QT_NO_CONTEXTLESS_CONNECT DEPENDENCIES QtQml PUBLIC_LIBRARIES |