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

Add a feature for Qt Sql

Browse Source 
This way we can disable it by passing -no-feature-sql to configure.

Change-Id: Ia47d72101de0788478997fa1854cedcd1742f6fd
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:12:16 +01:00
parent 5c207c6c79
commit 3b609fc76f
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.json
View File

@ -934,6 +934,10 @@
"label": "Qt Network", "label": "Qt Network",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"sql": {
"label": "Qt Sql",
"output": [ "privateFeature" ]
},
"widgets": { "widgets": {
"label": "Qt Widgets", "label": "Qt Widgets",
"condition": "features.gui", "condition": "features.gui",
@ -1128,6 +1132,7 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5
"dbus-linked", "dbus-linked",
"gui", "gui",
"network", "network",
"sql",
"widgets" "widgets"
] ]
}, { }, {

8
src/src.pro
View File

@ -124,7 +124,7 @@ 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_sql src_xml src_plugins.depends = src_xml
src_android.subdir = $$PWD/android src_android.subdir = $$PWD/android
@ -144,11 +144,15 @@ 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_sql src_xml src_testlib SUBDIRS += src_xml src_testlib
qtConfig(network) { qtConfig(network) {
SUBDIRS += src_network SUBDIRS += src_network
src_plugins.depends += src_network src_plugins.depends += src_network
} }
qtConfig(sql) {
SUBDIRS += src_sql
src_plugins.depends += src_sql
}
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