1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a feature for Qt Testlib

Browse Source 
... 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>
This commit is contained in:
Ulf Hermann 2016-11-23 10:14:48 +01:00
parent 3b609fc76f
commit f704aba7fc
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.json
View File

@ -938,6 +938,10 @@
"label": "Qt Sql", "label": "Qt Sql",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"testlib": {
"label": "Qt Testlib",
"output": [ "privateFeature" ]
},
"widgets": { "widgets": {
"label": "Qt Widgets", "label": "Qt Widgets",
"condition": "features.gui", "condition": "features.gui",
@ -1133,6 +1137,7 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5
"gui", "gui",
"network", "network",
"sql", "sql",
"testlib",
"widgets" "widgets"
] ]
}, { }, {

3
src/src.pro
View File

@ -144,7 +144,7 @@ qtConfig(regularexpression):pcre {
SUBDIRS += src_corelib src_tools_qlalr SUBDIRS += src_corelib src_tools_qlalr
TOOLS = src_tools_moc src_tools_rcc src_tools_qlalr TOOLS = src_tools_moc src_tools_rcc src_tools_qlalr
win32:SUBDIRS += src_winmain win32:SUBDIRS += src_winmain
SUBDIRS += src_xml src_testlib SUBDIRS += src_xml
qtConfig(network) { qtConfig(network) {
SUBDIRS += src_network SUBDIRS += src_network
src_plugins.depends += src_network src_plugins.depends += src_network
@ -153,6 +153,7 @@ qtConfig(sql) {
SUBDIRS += src_sql SUBDIRS += src_sql
src_plugins.depends += src_sql src_plugins.depends += src_sql
} }
qtConfig(testlib): SUBDIRS += src_testlib
qtConfig(dbus) { qtConfig(dbus) {
force_dbus_bootstrap|qtConfig(private_tests): \ force_dbus_bootstrap|qtConfig(private_tests): \
SUBDIRS += src_tools_bootstrap_dbus SUBDIRS += src_tools_bootstrap_dbus