summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmir Masoud Abdol <amir.abdol@qt.io>2023-04-21 10:04:16 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-04-23 20:20:20 +0000
commit9cdb47d85de76b8ee380ab1bb72e106a646b0fb0 (patch)
tree65ec31924b41c9b8f189f9420686f787abb0cf61
parentfa62e8d950f552081c6d184bfbe2e1cffcb8c3d6 (diff)
downloadqtsensors-9cdb47d85de76b8ee380ab1bb72e106a646b0fb0.tar.gz
Exclude files from Unity Build
`dbusPath()` is defined in several places, and it seems to me that it can be implemented as a private static data member. When resolved, we can remove these files from the exclusion list. Task-number: QTBUG-109394 Change-Id: I1f4290fb8495ce1f1c941a46240b60c8fed4bbe4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 416dbee5ce0d60383adcf33fdf822efc8ea85b0d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/plugins/sensors/iio-sensor-proxy/CMakeLists.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/sensors/iio-sensor-proxy/CMakeLists.txt b/src/plugins/sensors/iio-sensor-proxy/CMakeLists.txt
index 040d212..83093e1 100644
--- a/src/plugins/sensors/iio-sensor-proxy/CMakeLists.txt
+++ b/src/plugins/sensors/iio-sensor-proxy/CMakeLists.txt
@@ -14,6 +14,12 @@ qt_internal_add_plugin(IIOSensorProxySensorPlugin
iiosensorproxyorientationsensor.cpp iiosensorproxyorientationsensor.h
iiosensorproxysensorbase.cpp iiosensorproxysensorbase.h
main.cpp
+ NO_UNITY_BUILD_SOURCES
+ # Duplicate symbol definition between, iiosensorproxycompass.cpp, and
+ # the followings
+ # TODO: dbusPath() can probably be implemented as a static data member
+ iiosensorproxylightsensor.cpp
+ iiosensorproxyorientationsensor.cpp
DBUS_INTERFACE_SOURCES
org.freedesktop.DBus.Properties.xml
net.hadess.SensorProxy.xml