diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2016-11-23 10:14:48 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-01-06 17:18:35 +0000 |
| commit | f704aba7fc73b75f7bc3a1be962b28859d83e3aa (patch) | |
| tree | 2e597e7a6b95af8bacdf16ab7c7804104aacd0f7 | |
| parent | 3b609fc76fd6bf72faa52884c039bb0a074b4e72 (diff) | |
Add a feature for Qt Testlib
... so that we can turn it off if we don't want to build it.
Change-Id: Ib27386da4754d843d4e4cbb05f9542852efefb88
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| -rw-r--r-- | configure.json | 5 | ||||
| -rw-r--r-- | src/src.pro | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/configure.json b/configure.json index 052aeac30c..c505c6ab91 100644 --- a/configure.json +++ b/configure.json @@ -938,6 +938,10 @@ "label": "Qt Sql", "output": [ "privateFeature" ] }, + "testlib": { + "label": "Qt Testlib", + "output": [ "privateFeature" ] + }, "widgets": { "label": "Qt Widgets", "condition": "features.gui", @@ -1133,6 +1137,7 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5 "gui", "network", "sql", + "testlib", "widgets" ] }, { diff --git a/src/src.pro b/src/src.pro index fa408d4787..5b353fde09 100644 --- a/src/src.pro +++ b/src/src.pro @@ -144,7 +144,7 @@ qtConfig(regularexpression):pcre { SUBDIRS += src_corelib src_tools_qlalr TOOLS = src_tools_moc src_tools_rcc src_tools_qlalr win32:SUBDIRS += src_winmain -SUBDIRS += src_xml src_testlib +SUBDIRS += src_xml qtConfig(network) { SUBDIRS += src_network src_plugins.depends += src_network @@ -153,6 +153,7 @@ qtConfig(sql) { SUBDIRS += src_sql src_plugins.depends += src_sql } +qtConfig(testlib): SUBDIRS += src_testlib qtConfig(dbus) { force_dbus_bootstrap|qtConfig(private_tests): \ SUBDIRS += src_tools_bootstrap_dbus |