diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:40:01 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:40:01 +0200 |
| commit | ab19bcfffc5b5074f9ff68903abeac1c14b576ac (patch) | |
| tree | aad9a01e855666dc05d09b8aa435d58ff52877a7 /src/3rdparty | |
| parent | 20412631b3363866b764368cfd715dec6f148412 (diff) | |
| parent | c82bd369121a89fa999f41362ec904f00461b997 (diff) | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
Change-Id: Ib841f2c7f6c0819ff9b41a11249331ca585d6d60
Diffstat (limited to 'src/3rdparty')
| -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 } |