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 | |
| parent | 20412631b3363866b764368cfd715dec6f148412 (diff) | |
| parent | c82bd369121a89fa999f41362ec904f00461b997 (diff) | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
Change-Id: Ib841f2c7f6c0819ff9b41a11249331ca585d6d60
| -rw-r--r-- | dist/changes-5.1.1 | 25 | ||||
| -rw-r--r-- | src/3rdparty/zlib_dependency.pri | 6 |
2 files changed, 30 insertions, 1 deletions
diff --git a/dist/changes-5.1.1 b/dist/changes-5.1.1 new file mode 100644 index 0000000..e233af4 --- /dev/null +++ b/dist/changes-5.1.1 @@ -0,0 +1,25 @@ +Qt 5.1.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.1.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + + http://qt-project.org/doc/qt-5.1/ + +The Qt version 5.1 series is binary compatible with the 5.0.x series. +Applications compiled for 5.0 will continue to run with 5.1. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + http://bugreports.qt-project.org/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + +**************************************************************************** +* General * +**************************************************************************** + + - This release contains only minor code improvements. 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 } |