From c82bd369121a89fa999f41362ec904f00461b997 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Mon, 29 Jul 2013 18:35:48 +0200
Subject: [PATCH] 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>
---
src/3rdparty/zlib_dependency.pri | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/3rdparty/zlib_dependency.pri b/src/3rdparty/zlib_dependency.pri
index 1bc00752..fc055222 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
}
--
GitLab