From 963048b982d823e44e785b765b70249720acd252 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Mon, 22 Jul 2013 13:40:23 +0200 Subject: Add changes-5.1.1 file Change-Id: I397cf428dcf41092673b6b45e1bf5bfb39db6cbf Reviewed-by: Sergio Ahumada --- dist/changes-5.1.1 | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 dist/changes-5.1.1 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. -- cgit v1.2.1 From d878e1cc5640b2f9d207f42490ea9f9366ef7125 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Tue, 23 Jul 2013 12:05:56 +0200 Subject: Bump MODULE_VERSION to 5.1.2 Change-Id: Iad84e8a461e382e30db59fd33d8ef3240225392c Reviewed-by: Oswald Buddenhagen --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index a7e09bf..89914d2 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += qt_example_installs -MODULE_VERSION = 5.1.1 +MODULE_VERSION = 5.1.2 -- cgit v1.2.1 From cfd6618b3b9526bc82410411249692a32f29ee88 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 29 Jul 2013 18:36:58 +0200 Subject: fix shadow build with -qt-zlib and pre-generated headers Task-number: QTBUG-32641 Change-Id: Ifefa62ff8ce50207de47caf958c96f8b033ebc23 Reviewed-by: Joerg Bornemann --- src/svg/svg.pro | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 } -- cgit v1.2.1