From 0f336e85655fd50cf84b67cf9101e92bba1efbfc Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Sat, 7 Nov 2015 00:26:03 +0400 Subject: Introduce png_dependency.pri 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 Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/3rdparty/png_dependency.pri | 6 ++++++ src/gui/image/qpnghandler.pri | 7 +------ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 src/3rdparty/png_dependency.pri (limited to 'src') diff --git a/src/3rdparty/png_dependency.pri b/src/3rdparty/png_dependency.pri new file mode 100644 index 0000000000..78da861f77 --- /dev/null +++ b/src/3rdparty/png_dependency.pri @@ -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) +} diff --git a/src/gui/image/qpnghandler.pri b/src/gui/image/qpnghandler.pri index 9ab175d628..505d214130 100644 --- a/src/gui/image/qpnghandler.pri +++ b/src/gui/image/qpnghandler.pri @@ -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) -- cgit v1.2.3