diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-05-05 10:27:16 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-05-05 10:27:16 +0200 |
| commit | 8922ae1ef4f0cb01c15632dfe19ed514e0d49dbe (patch) | |
| tree | 05435d06e51d4d4a3ebbbdaab6d550c634155beb /src/src.pro | |
| parent | 56e80eb797b55458614599a82c2264c46e6e5eb0 (diff) | |
| parent | d603bd03795b412fd7a20f4bd804e236560a90c6 (diff) | |
| download | qtlocation-8922ae1ef4f0cb01c15632dfe19ed514e0d49dbe.tar.gz | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
src/src.pro
Change-Id: Ibc0a58c565aec37fb09b96e27309f50892340cac
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/src.pro b/src/src.pro index c00a4b8a..dc0dcad1 100644 --- a/src/src.pro +++ b/src/src.pro @@ -5,9 +5,13 @@ SUBDIRS += positioning plugins.depends = positioning SUBDIRS += plugins -positioning_doc_snippets.subdir = positioning/doc/snippets -positioning_doc_snippets.depends = positioning -SUBDIRS += positioning_doc_snippets +contains(QT_CONFIG, private_tests) { + positioning_doc_snippets.subdir = positioning/doc/snippets + #plugin dependency required during static builds + positioning_doc_snippets.depends = positioning plugins + + SUBDIRS += positioning_doc_snippets +} qtHaveModule(quick) { SUBDIRS += 3rdparty @@ -18,9 +22,13 @@ qtHaveModule(quick) { plugins.depends += location imports.depends += location - location_doc_snippets.subdir = location/doc/snippets - location_doc_snippets.depends = location - SUBDIRS += location_doc_snippets + contains(QT_CONFIG, private_tests) { + location_doc_snippets.subdir = location/doc/snippets + #plugin dependency required during static builds + location_doc_snippets.depends = location plugins + + SUBDIRS += location_doc_snippets + } imports.depends += positioning SUBDIRS += imports |