diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2016-11-23 10:43:47 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-01-06 17:19:13 +0000 |
| commit | 20e0bca834a1cae1816f17ef0dbfe8b74192d8dd (patch) | |
| tree | f22632ec683625d12e72db700d8070175939c444 | |
| parent | f704aba7fc73b75f7bc3a1be962b28859d83e3aa (diff) | |
Add a feature for Qt Xml
... 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>
| -rw-r--r-- | configure.json | 7 | ||||
| -rw-r--r-- | src/src.pro | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/configure.json b/configure.json index c505c6ab91..6dffa33289 100644 --- a/configure.json +++ b/configure.json @@ -951,6 +951,10 @@ { "type": "publicQtConfig", "negative": true } ] }, + "xml": { + "label": "Qt Xml", + "output": [ "privateFeature" ] + }, "libudev": { "label": "udev", "condition": "libs.libudev", @@ -1138,7 +1142,8 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5 "network", "sql", "testlib", - "widgets" + "widgets", + "xml" ] }, { "section": "Support enabled for", diff --git a/src/src.pro b/src/src.pro index 5b353fde09..c0366f32b6 100644 --- a/src/src.pro +++ b/src/src.pro @@ -124,7 +124,6 @@ src_printsupport.depends = src_corelib src_gui src_widgets src_tools_uic src_plugins.subdir = $$PWD/plugins src_plugins.target = sub-plugins -src_plugins.depends = src_xml src_android.subdir = $$PWD/android @@ -144,7 +143,6 @@ 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 qtConfig(network) { SUBDIRS += src_network src_plugins.depends += src_network @@ -153,6 +151,7 @@ qtConfig(sql) { SUBDIRS += src_sql src_plugins.depends += src_sql } +qtConfig(xml): SUBDIRS += src_xml qtConfig(testlib): SUBDIRS += src_testlib qtConfig(dbus) { force_dbus_bootstrap|qtConfig(private_tests): \ |