diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2014-12-09 12:22:55 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2014-12-10 13:50:50 +0100 |
| commit | 3c6693ee7f431320b2500c9c4440bb649ed50c89 (patch) | |
| tree | 9d72872b55ff9ae4350b1c0f7973ce9b457a38bc | |
| parent | 486874134b83672ae46bce315f632943829d5303 (diff) | |
| download | qtlocation-3c6693ee7f431320b2500c9c4440bb649ed50c89.tar.gz | |
Fix static linking when using libpoly2tri
Task-number: QTBUG-43006
Change-Id: I2143b815d8b597f3a02e8bd18021f6133fa9ea17
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| -rw-r--r-- | src/3rdparty/poly2tri/poly2tri.pro | 10 | ||||
| -rw-r--r-- | src/imports/location/location.pro | 12 |
2 files changed, 3 insertions, 19 deletions
diff --git a/src/3rdparty/poly2tri/poly2tri.pro b/src/3rdparty/poly2tri/poly2tri.pro index 981f375d..f042bd84 100644 --- a/src/3rdparty/poly2tri/poly2tri.pro +++ b/src/3rdparty/poly2tri/poly2tri.pro @@ -1,11 +1,8 @@ -TEMPLATE = lib TARGET = poly2tri CONFIG += staticlib -CONFIG -= qt -contains(QT_CONFIG, debug_and_release):CONFIG += debug_and_release -contains(QT_CONFIG, build_all):CONFIG += build_all +load(qt_helper_lib) # workaround for QTBUG-31586 contains(QT_CONFIG, c++11): CONFIG += c++11 @@ -19,8 +16,3 @@ SOURCES += common/shapes.cpp \ sweep/cdt.cpp \ sweep/sweep.cpp \ sweep/advancing_front.cpp - -# We don't need to install this lib, it's only used for building qtlocation -# However we do have to make sure that 'make install' builds it. -dummytarget.CONFIG = dummy_install -INSTALLS += dummytarget diff --git a/src/imports/location/location.pro b/src/imports/location/location.pro index c04a16e0..53ef61a6 100644 --- a/src/imports/location/location.pro +++ b/src/imports/location/location.pro @@ -5,16 +5,6 @@ INCLUDEPATH += ../../location/maps INCLUDEPATH += ../../positioning INCLUDEPATH *= $$PWD -LIBS += -L../../3rdparty/poly2tri -lpoly2tri - -win32 { - CONFIG(debug, debug|release) { - LIBS += -L../../3rdparty/poly2tri/debug - } else { - LIBS += -L../../3rdparty/poly2tri/release - } -} - HEADERS += \ qdeclarativegeomapitemview_p.h \ qdeclarativegeoserviceprovider_p.h \ @@ -66,6 +56,8 @@ include(declarativeplaces/declarativeplaces.pri) load(qml_plugin) +LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lpoly2tri$$qtPlatformTargetSuffix() + OTHER_FILES += \ plugin.json \ qmldir |