diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2020-08-31 15:41:03 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2020-09-09 13:54:28 +0000 |
| commit | 6b2cf7e9d150b7be709fcd688c5045949cedc3d9 (patch) | |
| tree | 2dc09a918e37fe73815b968365cae76b308e7b75 /src/location | |
| parent | 7769ea903f87efc4ad55530a2749f104eddff2e4 (diff) | |
| download | qtlocation-6b2cf7e9d150b7be709fcd688c5045949cedc3d9.tar.gz | |
Make names of poly2tri, clipper, clip2tri libraries unique
This avoids conflicts for static builds, where the system might
also provide a clipper2tri, clipper, or poly2tri library.
[ChangeLog][General] The generated clipper2tri, clipper,
poly2tri libraries have been renamed to qt_clipper2tri, qt_clipper,
qt_poly2tri. This avoids conflicts for static builds.
Pick-to: 5.15
Fixes: QTBUG-86248
Change-Id: I38261633acef1d3be0cb5b67b3b5bf3262258a95
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/location')
| -rw-r--r-- | src/location/declarativemaps/declarativemaps.pri | 2 | ||||
| -rw-r--r-- | src/location/location.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/location/declarativemaps/declarativemaps.pri b/src/location/declarativemaps/declarativemaps.pri index e2a922f4..12199eec 100644 --- a/src/location/declarativemaps/declarativemaps.pri +++ b/src/location/declarativemaps/declarativemaps.pri @@ -68,5 +68,5 @@ SOURCES += \ declarativemaps/qquickgeomapgesturearea.cpp load(qt_build_paths) -LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lpoly2tri$$qtPlatformTargetSuffix() -lclip2tri$$qtPlatformTargetSuffix() +LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lqt_poly2tri$$qtPlatformTargetSuffix() -lqt_clip2tri$$qtPlatformTargetSuffix() diff --git a/src/location/location.pro b/src/location/location.pro index 1b541b9e..b0e2c3f1 100644 --- a/src/location/location.pro +++ b/src/location/location.pro @@ -45,4 +45,4 @@ HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS load(qt_module) -LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lclip2tri$$qtPlatformTargetSuffix() +LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lqt_clip2tri$$qtPlatformTargetSuffix() |