diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-27 10:42:08 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-27 10:42:08 +0200 |
| commit | 7702fe86029c771e641a918baa221b9737c0f18e (patch) | |
| tree | 8e0795bc4c701518e1c66922f8e8b0cb359da155 /src/sql/configure.json | |
| parent | 1dd54b5647d33416c39fb41fdab560c815356951 (diff) | |
| parent | 38550c562d918e783bb609622bc8fb46de1bfec4 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: Icdd71e9713725bda9c305e338f5c8b41a92ed8e8
Diffstat (limited to 'src/sql/configure.json')
| -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 e8d1fb6ce3..49444c7e5f 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" } ] } }, |