summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmir Masoud Abdol <amir.abdol@qt.io>2023-02-24 17:34:26 +0100
committerAmir Masoud Abdol <amir.abdol@qt.io>2023-02-27 14:39:29 +0100
commitbf874c86f710faf627439f3e53b9cdfd5adca71f (patch)
tree656b73057f0587bd7357ecd8c4f73f56775e3f68
parentc6f18b1c8916962b59c90d28ca958503c00d1f45 (diff)
downloadqtlocation-bf874c86f710faf627439f3e53b9cdfd5adca71f.tar.gz
Resolve a duplicate symbol during Unity Build
By excluding them from the unity build Pick-to: 6.5 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>
-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