diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 17:50:46 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-05-19 17:50:46 +0000 |
| commit | 1f8bc502c8d1f9b92cf13c4aefc5f76607f474ab (patch) | |
| tree | bf6d5cebae9c680d2db331c536b88c9a1e684e3d /src/3rdparty/zlib_dependency.pri | |
| parent | b98f599948ddc0380e3392aab593fd426760d0f0 (diff) | |
| parent | 818014b449ef996099b4795a82f09651cf1c0129 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/3rdparty/zlib_dependency.pri')
| -rw-r--r-- | src/3rdparty/zlib_dependency.pri | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/3rdparty/zlib_dependency.pri b/src/3rdparty/zlib_dependency.pri index 0bcb9f9e5e..53e0b3ef39 100644 --- a/src/3rdparty/zlib_dependency.pri +++ b/src/3rdparty/zlib_dependency.pri @@ -7,4 +7,8 @@ contains(QT_CONFIG, system-zlib) { } } else { INCLUDEPATH += $$PWD/zlib + !no_core_dep { + CONFIG += qt + QT_PRIVATE += core + } } |