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 /src/3rdparty | |
| parent | a8c98dcb89f2b3f8438555d8febe17d3542d0567 (diff) | |
| parent | 0d720a000f4f35c5ea6942426efec6847b06f4ce (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: If6ba05867e7c98159e1b94ff71923e8b36bdbccb
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/png_dependency.pri | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/3rdparty/png_dependency.pri b/src/3rdparty/png_dependency.pri index eb32432b49..2ec2e8929d 100644 --- a/src/3rdparty/png_dependency.pri +++ b/src/3rdparty/png_dependency.pri @@ -1,6 +1,14 @@ contains(QT_CONFIG, system-png) { - unix|mingw: LIBS_PRIVATE += -lpng - else: LIBS += libpng.lib + unix|mingw { + !contains(QT_CONFIG, no-pkg-config) { + CONFIG += link_pkgconfig + PKGCONFIG_PRIVATE += libpng + } else { + LIBS_PRIVATE += -lpng + } + } else { + LIBS += libpng.lib + } } else: contains(QT_CONFIG, png) { INCLUDEPATH += $$PWD/libpng LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtpng$$qtPlatformTargetSuffix() |