From 6b2cf7e9d150b7be709fcd688c5045949cedc3d9 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. Pick-to: 5.15 Fixes: QTBUG-86248 Change-Id: I38261633acef1d3be0cb5b67b3b5bf3262258a95 Reviewed-by: Alex Blasche --- src/3rdparty/clip2tri/clip2tri.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/3rdparty/clip2tri/clip2tri.pro') 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() -- cgit v1.2.1