diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-03-06 20:08:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-03-22 14:11:18 +0000 |
| commit | 87e14eb7cb964467f6dda83dd17668609e68a203 (patch) | |
| tree | 5eb63708190a877979f216ba7c31a334dbf59519 /src/sql | |
| parent | 8f7776df5e649a99377776d4f2b91c220632f36f (diff) | |
don't try to use system zlib if it's not enabled
... as that would error out unhelpfully.
but hypothetically, there could be dynamic builds of system libpng and
sqlite3 against a static zlib, so allow it. however, it's a tad
unlikely, so default to -qt-libpng when using -qt-zlib (and -qt-sqlite3
is the default anyway).
amends dab013804.
Change-Id: I74c41e8d8a7ee1ba5add395842383d176e23f142
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/sql')
| -rw-r--r-- | src/sql/configure.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sql/configure.json b/src/sql/configure.json index 45b3fd9dd1..9555b64f39 100644 --- a/src/sql/configure.json +++ b/src/sql/configure.json @@ -117,7 +117,7 @@ "-lsqlite3" ], "use": [ - { "lib": "zlib", "condition": "!config.win32" } + { "lib": "zlib", "condition": "!config.win32 && features.system-zlib" } ] } }, |