diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:30:37 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:30:37 +0200 |
| commit | bfda474003a1776359003661f141567cfa37d0d5 (patch) | |
| tree | 3519abb57c66f18a7d0cd25eeaf14453ea6f1f95 /src/svg/svg.pro | |
| parent | 87105efc53b2d807f5d33c1fb5ee92d348f31309 (diff) | |
| parent | cfd6618b3b9526bc82410411249692a32f29ee88 (diff) | |
| download | qtsvg-bfda474003a1776359003661f141567cfa37d0d5.tar.gz | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
Change-Id: I722d07e0de5ac4578867e5fdd2a9ee7779776b72
Diffstat (limited to 'src/svg/svg.pro')
| -rw-r--r-- | src/svg/svg.pro | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/svg/svg.pro b/src/svg/svg.pro index ee18997..5527fa1 100644 --- a/src/svg/svg.pro +++ b/src/svg/svg.pro @@ -48,5 +48,8 @@ contains(QT_CONFIG, system-zlib) { if(unix|win32-g++*): LIBS_PRIVATE += -lz else: LIBS += zdll.lib } else { - INCLUDEPATH += $$[QT_INSTALL_HEADERS/get]/QtZlib + git_build: \ + INCLUDEPATH += $$[QT_INSTALL_HEADERS/get]/QtZlib + else: \ + INCLUDEPATH += $$[QT_INSTALL_HEADERS/src]/QtZlib } |