summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@qt.io>2017-02-16 09:53:57 +0100
committerPaul Olav Tvete <paul.tvete@qt.io>2017-03-01 13:36:41 +0000
commit07d4376e0d9a147afe18c03d130bd5bc6c04ad49 (patch)
tree5177fd8b5bc76e2081399585a5ce1c2740b1a0e5
parent06a3ac26717794c053c23dc5c04914c0b1769e22 (diff)
Build fix for -no-feature-datestring
Change-Id: If3b744e9f7e7761d02664b1a117e0540fabe8915 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r--src/printsupport/configure.json2
-rw-r--r--src/sql/configure.json6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/printsupport/configure.json b/src/printsupport/configure.json
index dfef0bcd6c..45e768708e 100644
--- a/src/printsupport/configure.json
+++ b/src/printsupport/configure.json
@@ -28,7 +28,7 @@
"label": "CUPS",
"purpose": "Provides support for the Common Unix Printing System.",
"section": "Painting",
- "condition": "libs.cups && features.printer",
+ "condition": "libs.cups && features.printer && features.datestring",
"output": [ "privateFeature", "feature" ]
},
"cupsjobwidget": {
diff --git a/src/sql/configure.json b/src/sql/configure.json
index ff2409415b..e8d1fb6ce3 100644
--- a/src/sql/configure.json
+++ b/src/sql/configure.json
@@ -153,7 +153,7 @@
},
"sql-odbc": {
"label": "ODBC",
- "condition": "libs.odbc && features.textdate",
+ "condition": "libs.odbc && features.datestring",
"output": [ "publicFeature" ]
},
"sql-psql": {
@@ -168,7 +168,7 @@
},
"sql-sqlite": {
"label": "SQLite",
- "condition": "features.textdate",
+ "condition": "features.datestring",
"output": [ "publicFeature" ]
},
"system-sqlite": {
@@ -179,7 +179,7 @@
},
"sql-tds": {
"label": "TDS (Sybase)",
- "condition": "libs.tds && features.textdate",
+ "condition": "libs.tds && features.datestring",
"output": [ "publicFeature" ]
}
},