diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-02 09:04:38 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-02 09:04:38 +0100 |
| commit | 71264bae08d81bdeceb96133fdb01c370504dfcc (patch) | |
| tree | d5dadaac8209d5ef1857a4d65197b9ee12b39848 /src/sql | |
| parent | 5e785c0b83c9908c665f253c131629ac325a21f5 (diff) | |
| parent | 6d10f739cd750968d0dd0e9d8fa4b64353a86c6c (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I84097f8e7b3b2128028bd7693c913d6968b82bfe
Diffstat (limited to 'src/sql')
| -rw-r--r-- | src/sql/configure.json | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/sql/configure.json b/src/sql/configure.json index 72671b6df9..ff2409415b 100644 --- a/src/sql/configure.json +++ b/src/sql/configure.json @@ -8,7 +8,6 @@ "commandline": { "assignments": { "MYSQL_PATH": "mysql.prefix", - "PSQL_LIBS": "psql.libs", "SYBASE": "tds.prefix", "SYBASE_LIBS": "tds.libs" }, @@ -115,8 +114,10 @@ "test": "unix/sqlite", "sources": [ { "type": "pkgConfig", "args": "sqlite3" }, - { "libs": "-lsqlite3", "condition": "config.win32" }, - { "libs": "-lsqlite3 -lz", "condition": "!config.win32" } + "-lsqlite3" + ], + "use": [ + { "lib": "zlib", "condition": "!config.win32" } ] } }, @@ -152,7 +153,7 @@ }, "sql-odbc": { "label": "ODBC", - "condition": "libs.odbc", + "condition": "libs.odbc && features.textdate", "output": [ "publicFeature" ] }, "sql-psql": { @@ -167,6 +168,7 @@ }, "sql-sqlite": { "label": "SQLite", + "condition": "features.textdate", "output": [ "publicFeature" ] }, "system-sqlite": { @@ -177,7 +179,7 @@ }, "sql-tds": { "label": "TDS (Sybase)", - "condition": "libs.tds", + "condition": "libs.tds && features.textdate", "output": [ "publicFeature" ] } }, |