diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-29 10:10:22 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-29 10:10:22 +0200 |
commit | f27d8b9f570e7fe5eab527ea13ed8bc3ec172702 (patch) | |
tree | d84389d3c2a37b38435e0be5259f48e5f04290e0 /config.tests/unix/libpng | |
parent | a8c98dcb89f2b3f8438555d8febe17d3542d0567 (diff) | |
parent | 0d720a000f4f35c5ea6942426efec6847b06f4ce (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: If6ba05867e7c98159e1b94ff71923e8b36bdbccb
Diffstat (limited to 'config.tests/unix/libpng')
-rw-r--r-- | config.tests/unix/libpng/libpng.pro | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config.tests/unix/libpng/libpng.pro b/config.tests/unix/libpng/libpng.pro index 4e50fe26e5..cdca43171c 100644 --- a/config.tests/unix/libpng/libpng.pro +++ b/config.tests/unix/libpng/libpng.pro @@ -1,3 +1,8 @@ SOURCES = libpng.cpp CONFIG -= qt dylib -LIBS += -lpng +!contains(QT_CONFIG, no-pkg-config) { + CONFIG += link_pkgconfig + PKGCONFIG += libpng +} else { + LIBS += -lpng +} |