summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmir Masoud Abdol <amir.abdol@qt.io>2023-02-24 17:34:26 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-02-27 14:46:03 +0000
commit2691b2852dcc49a3bc60a82f5345ced892a2d8b6 (patch)
treed01d77784326c00bd21bbe394dae0c7804182b0c
parent3b309b082097f41a9401aee471819c339b074a32 (diff)
downloadqtlocation-2691b2852dcc49a3bc60a82f5345ced892a2d8b6.tar.gz
Resolve a duplicate symbol during Unity Build
By excluding them from the unity build Task-number: QTBUG-109394 Change-Id: I7108d75e792900f9bcc70d858ee058a3a3ba80f1 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit bf874c86f710faf627439f3e53b9cdfd5adca71f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/location/CMakeLists.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/location/CMakeLists.txt b/src/location/CMakeLists.txt
index dce71dfe..009dd78f 100644
--- a/src/location/CMakeLists.txt
+++ b/src/location/CMakeLists.txt
@@ -67,6 +67,9 @@ qt_internal_add_module(Location
places/qplaceratings.h places/qplaceratings_p.h places/qplaceratings.cpp
places/qplacecontactdetail.h places/qplacecontactdetail_p.h places/qplacecontactdetail.cpp
places/qplacecontent.h places/qplacecontent_p.h places/qplacecontent.cpp
+ NO_UNITY_BUILD_SOURCES
+ maps/qgeocameratiles.cpp
+ maps/qgeotiledmapscene.cpp
INCLUDE_DIRECTORIES
maps
places