1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce png_dependency.pri

Browse Source 
Just like any other x_dependency.pri, it shall be included instead of
linking with png lib directly.

Change-Id: I698c8a8137f937d2e2c5f5dc9b9188b780c9e49a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
This commit is contained in:
Konstantin Ritt 2015-11-07 00:26:03 +04:00
parent 037b05ac76
commit 0f336e8565
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/3rdparty/png_dependency.pri vendored Normal file
View File

@ -0,0 +1,6 @@
contains(QT_CONFIG, system-png) {
unix|mingw: LIBS_PRIVATE += -lpng
else: LIBS += libpng.lib
} else: contains(QT_CONFIG, png) {
include($$PWD/libpng.pri)
}

7
src/gui/image/qpnghandler.pri
View File

@ -1,9 +1,4 @@
HEADERS += $$PWD/qpnghandler_p.h
SOURCES += $$PWD/qpnghandler.cpp
contains(QT_CONFIG, system-png) {
if(unix|mingw): LIBS_PRIVATE += -lpng
else:win32: LIBS += libpng.lib
} else {
include($$PWD/../../3rdparty/libpng.pri)
}
include($$PWD/../../3rdparty/png_dependency.pri)