From 9ac778b23aa77c62470efcd6bb3afe57576c0aa7 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 31 Aug 2020 15:41:03 +0200 Subject: 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. Fixes: QTBUG-86248 Change-Id: I38261633acef1d3be0cb5b67b3b5bf3262258a95 Reviewed-by: Alex Blasche (cherry picked from commit 6b2cf7e9d150b7be709fcd688c5045949cedc3d9) Reviewed-by: Qt Cherry-pick Bot --- src/3rdparty/clip2tri/clip2tri.pro | 4 ++-- src/3rdparty/clipper/clipper.pro | 2 +- src/3rdparty/poly2tri/poly2tri.pro | 2 +- src/location/declarativemaps/declarativemaps.pri | 2 +- src/location/location.pro | 2 +- src/positioning/positioning.pro | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/3rdparty/clip2tri/clip2tri.pro b/src/3rdparty/clip2tri/clip2tri.pro index 802c0409..4059a63a 100644 --- a/src/3rdparty/clip2tri/clip2tri.pro +++ b/src/3rdparty/clip2tri/clip2tri.pro @@ -1,4 +1,4 @@ -TARGET = clip2tri +TARGET = qt_clip2tri CONFIG += staticlib exceptions warn_off optimize_full @@ -18,5 +18,5 @@ gcc { HEADERS += clip2tri.h SOURCES += clip2tri.cpp -LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lpoly2tri$$qtPlatformTargetSuffix() -lclipper$$qtPlatformTargetSuffix() +LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lqt_poly2tri$$qtPlatformTargetSuffix() -lqt_clipper$$qtPlatformTargetSuffix() diff --git a/src/3rdparty/clipper/clipper.pro b/src/3rdparty/clipper/clipper.pro index 874d55c5..a518d248 100644 --- a/src/3rdparty/clipper/clipper.pro +++ b/src/3rdparty/clipper/clipper.pro @@ -1,4 +1,4 @@ -TARGET = clipper +TARGET = qt_clipper CONFIG += staticlib exceptions warn_off optimize_full diff --git a/src/3rdparty/poly2tri/poly2tri.pro b/src/3rdparty/poly2tri/poly2tri.pro index 76f2779e..6c5f7692 100644 --- a/src/3rdparty/poly2tri/poly2tri.pro +++ b/src/3rdparty/poly2tri/poly2tri.pro @@ -1,4 +1,4 @@ -TARGET = poly2tri +TARGET = qt_poly2tri CONFIG += staticlib warn_off optimize_full 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() diff --git a/src/positioning/positioning.pro b/src/positioning/positioning.pro index 65350909..db499212 100644 --- a/src/positioning/positioning.pro +++ b/src/positioning/positioning.pro @@ -95,4 +95,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() -- cgit v1.2.1