diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-26 12:22:00 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-26 12:22:38 +0200 |
| commit | d340bf2be1738f3d47bc455ea122aef9a9e1c11d (patch) | |
| tree | 34d060b00cf14924d50c6419e9678804d9f62e58 /src/src.pro | |
| parent | 66a6e238876cc1201c5fe331c165ceba458dc56a (diff) | |
| parent | 592c381564e3f12b79a3d5e9fec5aec2b8045742 (diff) | |
| download | qtlocation-d340bf2be1738f3d47bc455ea122aef9a9e1c11d.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3
Conflicts:
.qmake.conf
Change-Id: I9a3d7ec0bb203ac8b5bd483af3973510ca33c4a9
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/src.pro b/src/src.pro index 0c0bf50b..54b3819a 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,14 +1,18 @@ TEMPLATE = subdirs -SUBDIRS += 3rdparty/clip2tri 3rdparty/clipper 3rdparty/poly2tri -3rdparty/clip2tri.depends = 3rdparty/clipper 3rdparty/poly2tri +clip2tri.subdir = 3rdparty/clip2tri +poly2tri.subdir = 3rdparty/poly2tri +clipper.subdir = 3rdparty/clipper + +SUBDIRS += clip2tri clipper poly2tri +clip2tri.depends = clipper poly2tri SUBDIRS += positioning -positioning.depends = 3rdparty/clip2tri +positioning.depends = clip2tri qtHaveModule(quick) { SUBDIRS += location - location.depends += positioning 3rdparty/clip2tri + location.depends += positioning clip2tri plugins.depends += location |