diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-15 20:56:56 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-15 20:56:56 +0200 |
| commit | 42a4a0df5880f217ecb0e1e748c5233a569bf4c7 (patch) | |
| tree | 4fa928054fa9a58bc3b565ca0166262f60941416 | |
| parent | 463524fac8942c5b81b6cccb6050d2b3db4ee0fa (diff) | |
| parent | 7ec1d9797b1a9c058945fad20a6c8d3171f89555 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I3953f2473e3b2cf9768286fef1c5efd08c61c6f0
| -rw-r--r-- | dist/changes-5.1.1 | 44 | ||||
| -rw-r--r-- | tests/auto/quick/qquickitem/qquickitem.pro | 2 | ||||
| -rw-r--r-- | tests/auto/quick/qquickmousearea/qquickmousearea.pro | 2 |
3 files changed, 48 insertions, 0 deletions
diff --git a/dist/changes-5.1.1 b/dist/changes-5.1.1 new file mode 100644 index 0000000000..be59ba9e79 --- /dev/null +++ b/dist/changes-5.1.1 @@ -0,0 +1,44 @@ +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/ + +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 * +**************************************************************************** + +General Improvements +-------------------- + +**************************************************************************** +* Library * +**************************************************************************** + + - [QTBUG-32621][QTBUG-32572][QTBUG-32545] Multiple fixes for the new + QtQuick.Dialogs ColorDialog. + - [QTBUG-30908] XmlHttpRequest: Requests which receive a redirect now use + GET as per spec. + - [QTBUG-32332] QtQuick.ListView: Snap immediately once snapMode changes. + - [QTBUG-31647] QtQuick.Text: Maintain vertical position when height + changes. + +**************************************************************************** +* Platform Specific Changes * +**************************************************************************** + +Qt for Embedded +-------------- + + - [QTBUG-30908] Fix SceneGraph text rendering on certain OpenGL ES drivers diff --git a/tests/auto/quick/qquickitem/qquickitem.pro b/tests/auto/quick/qquickitem/qquickitem.pro index ea6ae8f4af..5641ca5a6d 100644 --- a/tests/auto/quick/qquickitem/qquickitem.pro +++ b/tests/auto/quick/qquickitem/qquickitem.pro @@ -8,5 +8,7 @@ macx:CONFIG -= app_bundle TESTDATA = data/* +win32:CONFIG += insignificant_test # QTBUG-32664 + QT += core-private gui-private v8-private qml-private quick-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquickmousearea/qquickmousearea.pro b/tests/auto/quick/qquickmousearea/qquickmousearea.pro index dd7b434898..e9b06fd1df 100644 --- a/tests/auto/quick/qquickmousearea/qquickmousearea.pro +++ b/tests/auto/quick/qquickmousearea/qquickmousearea.pro @@ -10,5 +10,7 @@ include (../../shared/util.pri) TESTDATA = data/* +win32:CONFIG += insignificant_test # QTBUG-33006 + QT += core-private gui-private qml-private quick-private network testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |