summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2014-04-24 13:30:57 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-24 14:35:11 +0200
commit27c9ffe1d2eb2103e9b420c86c6fc3d10cb1ff76 (patch)
tree857f6bd4f2ee665ff27e17ac7c220940ea7effb7
parent4b08e5038229d113770e7ca57af73bfed7919480 (diff)
downloadqtlocation-27c9ffe1d2eb2103e9b420c86c6fc3d10cb1ff76.tar.gz
Build snippet outside of example build configurations too.
This is a partial revert of 9cbddccc24cdd4b51285ea9ecbf851f3eba2cd31. The CI does not test a combined developer-build and example configuration. Ensuring the snippet compiles is mostly a private test. This patch drops the additional example condition to provide an increased chance of compiling the snippets on the CI. So far the condition never triggered and hence the CI couldn't ensure a compiling snippet. Task-number: QTBUG-37638 Change-Id: I8e64bb2b53b0452c5168faeb37f2809e96ac6e77 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rw-r--r--src/src.pro8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/src.pro b/src/src.pro
index fb2ecc63..9d03f755 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -9,9 +9,7 @@ contains(QT_CONFIG, private_tests) {
positioning_doc_snippets.subdir = positioning/doc/snippets
#plugin dependency required during static builds
positioning_doc_snippets.depends = positioning plugins
- !contains(QT_BUILD_PARTS, examples) {
- positioning_doc_snippets.CONFIG = no_default_target no_default_install
- }
+
SUBDIRS += positioning_doc_snippets
}
@@ -29,9 +27,7 @@ qtHaveModule(3d) {
location_doc_snippets.subdir = location/doc/snippets
#plugin dependency required during static builds
location_doc_snippets.depends = location plugins
- !contains(QT_BUILD_PARTS, examples) {
- location_doc_snippets.CONFIG = no_default_target no_default_install
- }
+
SUBDIRS += location_doc_snippets
}
}