AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix qtlibpng being built despite system libpng being found

Browse Source 
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>
This commit is contained in:
James McDonnell 2016-12-13 14:33:04 -05:00 committed by Jani Heikkinen
parent 9cc3c8983e
commit b08bdfb2e4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/src.pro
View File

@ -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