summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStephan Binner <stephan.binner@basyskom.com>2017-02-24 13:35:48 +0100
committerStephan Binner <stephan.binner@basyskom.com>2017-02-27 07:46:41 +0000
commitf85f21edbc3b3a5a2e8e4bf652d987903b5dad6e (patch)
tree31924b9153cd0db158535652285900026ddaa99f /src
parent1d31f23ce9dd438e68aee0dbf1907e17b0d66db3 (diff)
Fix build for -no-feature-textdate
Change-Id: I31ad3fdde293759f04a136d7c7212288cafdc840 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/sql/configure.json5
-rw-r--r--src/widgets/configure.json2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/sql/configure.json b/src/sql/configure.json
index 45b3fd9dd1..ff2409415b 100644
--- a/src/sql/configure.json
+++ b/src/sql/configure.json
@@ -153,7 +153,7 @@
},
"sql-odbc": {
"label": "ODBC",
- "condition": "libs.odbc",
+ "condition": "libs.odbc && features.textdate",
"output": [ "publicFeature" ]
},
"sql-psql": {
@@ -168,6 +168,7 @@
},
"sql-sqlite": {
"label": "SQLite",
+ "condition": "features.textdate",
"output": [ "publicFeature" ]
},
"system-sqlite": {
@@ -178,7 +179,7 @@
},
"sql-tds": {
"label": "TDS (Sybase)",
- "condition": "libs.tds",
+ "condition": "libs.tds && features.textdate",
"output": [ "publicFeature" ]
}
},
diff --git a/src/widgets/configure.json b/src/widgets/configure.json
index e7007f71b7..7bc2e06a32 100644
--- a/src/widgets/configure.json
+++ b/src/widgets/configure.json
@@ -121,7 +121,7 @@
"label": "QDateTimeEdit",
"purpose": "Supports editing dates and times.",
"section": "Widgets",
- "condition": "features.calendarwidget && features.datestring",
+ "condition": "features.calendarwidget && features.datestring && features.textdate",
"output": [ "publicFeature", "feature" ]
},
"stackedwidget": {