diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-14 10:49:20 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-14 10:52:24 +0100 |
| commit | 0c034a649f61019c16aba479fe79d20dde41f2f2 (patch) | |
| tree | 54545862591044b65e618989805945bceb0b3ea5 /src/sql | |
| parent | 2162f01111d21d0ce66ceb8be290b0a13653e691 (diff) | |
| parent | df40b1115db600e8de1c4774476fa30956a34fd9 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qpushbutton.cpp
Change-Id: I615de00e6e64540c50f658d4d8ab3e002d701a81
Diffstat (limited to 'src/sql')
| -rw-r--r-- | src/sql/configure.json | 6 |
1 files changed, 3 insertions, 3 deletions
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" ] } }, |