diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-05-05 19:51:50 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-05-05 19:51:50 +0200 |
| commit | 025e88bfe5b2345dd09c173dc28a9d9a45ed11de (patch) | |
| tree | 0180b9123e479d7114b1caf2022dd8ff69162a17 /src/src.pro | |
| parent | ae7e701074be97130aa45f780e2456981850b432 (diff) | |
| parent | 538223d10d133d23133db1ec7a50cb2775aca657 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I003c0d6271c6444748bf30b4331eca3fb2410f44
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/src/src.pro b/src/src.pro index 30034ae952..f86ff44c63 100644 --- a/src/src.pro +++ b/src/src.pro @@ -162,7 +162,7 @@ src_android.subdir = $$PWD/android } } SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_tracegen -qtConfig(regularexpression):pcre2 { +qtConfig(regularexpression):!qtConfig(system-pcre2):pcre2 { SUBDIRS += src_3rdparty_pcre2 src_corelib.depends += src_3rdparty_pcre2 } @@ -172,12 +172,18 @@ win32:SUBDIRS += src_winmain qtConfig(network) { SUBDIRS += src_network src_plugins.depends += src_network + qtHaveModule(gui):qtConfig(private_tests) { + src_network_doc_snippets.subdir = network/doc/snippets + src_network_doc_snippets.target = sub-network-doc-snippets + src_network_doc_snippets.depends = src_network + SUBDIRS += src_network_doc_snippets + } } qtConfig(sql) { SUBDIRS += src_sql src_plugins.depends += src_sql - contains(QT_CONFIG, private_tests) { + qtConfig(private_tests) { src_sql_doc_snippets.subdir = sql/doc/snippets src_sql_doc_snippets.target = sub-sql-doc-snippets src_sql_doc_snippets.depends = src_sql @@ -185,7 +191,16 @@ qtConfig(sql) { } } qtConfig(xml): SUBDIRS += src_xml -qtConfig(testlib): SUBDIRS += src_testlib +qtConfig(testlib) { + SUBDIRS += src_testlib + qtConfig(private_tests) { + src_testlib_doc_snippets.subdir = testlib/doc/snippets + src_testlib_doc_snippets.target = sub-testlib-doc-snippets + src_testlib_doc_snippets.depends = src_testlib + SUBDIRS += src_testlib_doc_snippets + } +} + qtConfig(dbus) { force_dbus_bootstrap|qtConfig(private_tests): \ SUBDIRS += src_tools_bootstrap_dbus @@ -248,6 +263,12 @@ qtConfig(gui) { qtConfig(opengl) { SUBDIRS += src_openglwidgets } + qtConfig(private_tests) { + src_widgets_doc_snippets.subdir = widgets/doc/snippets + src_widgets_doc_snippets.target = sub-widgets-doc-snippets + src_widgets_doc_snippets.depends = src_widgets + SUBDIRS += src_widgets_doc_snippets + } } } SUBDIRS += src_plugins |