diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-18 09:01:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-18 09:01:51 +0100 |
| commit | c7934f2489e2eb9a539206bab35f335b1943c5bd (patch) | |
| tree | a27d0ed6c001fe9432e2a0f28fb935acf9e4c65f /src/3rdparty | |
| parent | f40593b11199fbef886bfcb6b210a214d8c3adf3 (diff) | |
| parent | 08f9a1bd6ab9b1777ee5ba163d75e5c848c39eb4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/corelib/io/qprocess.cpp
src/corelib/io/qprocess_unix.cpp
src/network/kernel/qnetworkinterface_winrt.cpp
tools/configure/configureapp.cpp
Change-Id: I47df00a01597d2e63b334b492b3b4221b29f58ea
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/png_dependency.pri | 6 |
1 files changed, 6 insertions, 0 deletions
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) +} |