diff options
| author | James McDonnell <jmcdonnell@blackberry.com> | 2016-12-13 14:33:04 -0500 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2016-12-15 05:19:56 +0000 |
| commit | b08bdfb2e4de1f0b01e771dcd6d65afea0cbdd24 (patch) | |
| tree | 17d7a178ef10b3897192094448e6fe316222d677 /src | |
| parent | 9cc3c8983e7f35dc52869cf44d566c752540f1fd (diff) | |
Fix qtlibpng being built despite system libpng being found
90eee08b made system-png a subset of png, which is strictly speaking a
porting error. However, as this is a good idea as such, fix it by adding
the missing !system-png check.
Change-Id: I1557a2130a22ac668be315dc9aea67845928ff4c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/src.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro index b13bc4fa43..90d7e2b76c 100644 --- a/src/src.pro +++ b/src/src.pro @@ -164,7 +164,7 @@ qtConfig(gui) { SUBDIRS += src_angle src_gui.depends += src_angle } - qtConfig(png) { + qtConfig(png):!qtConfig(system-png) { SUBDIRS += src_3rdparty_libpng src_3rdparty_freetype.depends += src_3rdparty_libpng src_gui.depends += src_3rdparty_libpng |