diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/src.pro | 25 |
2 files changed, 19 insertions, 8 deletions
diff --git a/.qmake.conf b/.qmake.conf index efd0e68f..ef45a002 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += qt_example_installs -MODULE_VERSION = 5.3.0 +MODULE_VERSION = 5.3.1 diff --git a/src/src.pro b/src/src.pro index 26d111d8..fb2ecc63 100644 --- a/src/src.pro +++ b/src/src.pro @@ -5,10 +5,15 @@ SUBDIRS += positioning plugins.depends = positioning SUBDIRS += plugins -#TEMPORARY fix for static build errors (QTBUG-37638) -#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 + !contains(QT_BUILD_PARTS, examples) { + positioning_doc_snippets.CONFIG = no_default_target no_default_install + } + SUBDIRS += positioning_doc_snippets +} #no point in building QtLocation without Qt3D qtHaveModule(3d) { @@ -20,9 +25,15 @@ qtHaveModule(3d) { plugins.depends += location qtHaveModule(quick):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 + !contains(QT_BUILD_PARTS, examples) { + location_doc_snippets.CONFIG = no_default_target no_default_install + } + SUBDIRS += location_doc_snippets + } } qtHaveModule(quick) { |