diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-29 18:35:48 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-30 11:42:47 +0200 |
| commit | c82bd369121a89fa999f41362ec904f00461b997 (patch) | |
| tree | cf4adbe622d0847afb25cb7b536d4dc16bae29d8 /src/3rdparty/zlib_dependency.pri | |
| parent | d4a0e849b9f1534520af99093f0dd05254857e77 (diff) | |
fix shadow build with -qt-zlib and pre-generated headers
Task-number: QTBUG-32641
Change-Id: I4d0b4df50b652cf47e5f0b75b6d3c1f714414007
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/3rdparty/zlib_dependency.pri')
| -rw-r--r-- | src/3rdparty/zlib_dependency.pri | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/3rdparty/zlib_dependency.pri b/src/3rdparty/zlib_dependency.pri index 1bc0075..fc05522 100644 --- a/src/3rdparty/zlib_dependency.pri +++ b/src/3rdparty/zlib_dependency.pri @@ -3,5 +3,9 @@ contains(QT_CONFIG, system-zlib) { if(unix|win32-g++*): LIBS_PRIVATE += -lz else: LIBS += zdll.lib } else { - INCLUDEPATH += $$[QT_INSTALL_HEADERS/get]/QtZlib + load(qt_build_paths) + git_build: \ + INCLUDEPATH += $$[QT_INSTALL_HEADERS/get]/QtZlib + else: \ + INCLUDEPATH += $$[QT_INSTALL_HEADERS/src]/QtZlib } |