diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-02-24 22:15:56 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-02-24 23:32:33 +0000 |
| commit | 63856135dacba615ebfabdf03be2926dc763358f (patch) | |
| tree | a0a29ebb0572b190f837c96c5eb8f4e310601b0d /src/sql/configure.json | |
| parent | 14db1d5560254766746446069b6f2456e4444602 (diff) | |
| parent | de49839df8abfba1f3ed3c36ef3177e4a9d6ef00 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.8' into 5.9" into refs/staging/5.9
Diffstat (limited to 'src/sql/configure.json')
| -rw-r--r-- | src/sql/configure.json | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/sql/configure.json b/src/sql/configure.json index 72671b6df9..45b3fd9dd1 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" } ] } }, |