diff --git a/src/sql/configure.json b/src/sql/configure.json
index 45b3fd9dd1f..ff2409415be 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 e7007f71b78..7bc2e06a329 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": {