diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-07-01 12:33:16 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-07-01 13:21:29 +0200 |
| commit | 200fdd96f0aae9d2060cf3b8cb491eda10d6d68f (patch) | |
| tree | 80b3a1450c3fa8cbd44e07d82f6f5d3985a5902e /src/3rdparty | |
| parent | cb260c6c7f1ebd4b3fa5f86c3d98ec8ff0486095 (diff) | |
| parent | e2665600c09358854bb0b29389cc873a2684f77b (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
configure
configure.json
Change-Id: Iba032d9a29c273da2585632bc6e22bbafb961808
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() |