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

Add a feature for Qt Xml

Browse Source 
... so that we can turn it off if we don't want to build it.

Change-Id: Ia330dfa1477bcd2dc8e24eb55400e100fca156b5
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:43:47 +01:00
parent f704aba7fc
commit 20e0bca834
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.json
View File

@ -951,6 +951,10 @@
{ "type": "publicQtConfig", "negative": true } { "type": "publicQtConfig", "negative": true }
] ]
}, },
"xml": {
"label": "Qt Xml",
"output": [ "privateFeature" ]
},
"libudev": { "libudev": {
"label": "udev", "label": "udev",
"condition": "libs.libudev", "condition": "libs.libudev",
@ -1138,7 +1142,8 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5
"network", "network",
"sql", "sql",
"testlib", "testlib",
"widgets" "widgets",
"xml"
] ]
}, { }, {
"section": "Support enabled for", "section": "Support enabled for",

3
src/src.pro
View File

@ -124,7 +124,6 @@ src_printsupport.depends = src_corelib src_gui src_widgets src_tools_uic
src_plugins.subdir = $$PWD/plugins src_plugins.subdir = $$PWD/plugins
src_plugins.target = sub-plugins src_plugins.target = sub-plugins
src_plugins.depends = src_xml
src_android.subdir = $$PWD/android src_android.subdir = $$PWD/android
@ -144,7 +143,6 @@ 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
qtConfig(network) { qtConfig(network) {
SUBDIRS += src_network SUBDIRS += src_network
src_plugins.depends += src_network src_plugins.depends += src_network
@ -153,6 +151,7 @@ qtConfig(sql) {
SUBDIRS += src_sql SUBDIRS += src_sql
src_plugins.depends += src_sql src_plugins.depends += src_sql
} }
qtConfig(xml): SUBDIRS += src_xml
qtConfig(testlib): SUBDIRS += src_testlib qtConfig(testlib): SUBDIRS += src_testlib
qtConfig(dbus) { qtConfig(dbus) {
force_dbus_bootstrap|qtConfig(private_tests): \ force_dbus_bootstrap|qtConfig(private_tests): \