diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-24 10:21:32 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-24 10:25:46 +0100 |
| commit | f9ba7d29464eb7f13004918faa73d37f7b4ea725 (patch) | |
| tree | 2e031d4ce96214d8301c22a74a50efcb37603a6c | |
| parent | beffe565e3511bdd01a967303066a5dce88022f4 (diff) | |
| parent | 5225a0f570e6a5dbd9b3453123eb85031656ad19 (diff) | |
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
| -rw-r--r-- | dist/changes-5.2.1 | 38 | ||||
| -rw-r--r-- | src/qml/compiler/qv4regalloc.cpp | 3 |
2 files changed, 38 insertions, 3 deletions
diff --git a/dist/changes-5.2.1 b/dist/changes-5.2.1 new file mode 100644 index 0000000000..c5371185f0 --- /dev/null +++ b/dist/changes-5.2.1 @@ -0,0 +1,38 @@ +Qt 5.2.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.2.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.2 + +The Qt version 5.2 series is binary compatible with the 5.1.x series. +Applications compiled for 5.1 will continue to run with 5.2. + +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. + +**************************************************************************** +* Library * +**************************************************************************** + +QtQml +----- + + - [QTBUG-35979] Fixed JavaScript Array.pop() not updating the + internal array length correctly + +QtQuick +------- + + - [QTBUG-35128] Fixed TextInput to call fixup() on its validator when + being accepted or losing focus, and the validator reports that the input + is in "intermediate" state ie. the input should be fixed up. + - [QTBUG-34517] Fixed an issue that caused QQuickTextInput to not + accept delete/home/backspace/left/right keys when the key was used + in a shortcut. diff --git a/src/qml/compiler/qv4regalloc.cpp b/src/qml/compiler/qv4regalloc.cpp index b80e5d3ee8..a3255f26f7 100644 --- a/src/qml/compiler/qv4regalloc.cpp +++ b/src/qml/compiler/qv4regalloc.cpp @@ -956,9 +956,6 @@ private: moveTo = createTemp(Temp::StackSlot, spillSlot, it->temp().type); } else { moveTo = createTemp(Temp::PhysicalRegister, platformRegister(*it), it->temp().type); - const int spillSlot = _assignedSpillSlots.value(it->temp(), -1); - if (isPhiTarget && spillSlot != -1) - mapping.add(moveFrom, createTemp(Temp::StackSlot, spillSlot, it->temp().type)); } // add move to mapping |