From 9abd557e2c718b02fc0a14999150e50508ff5f9a Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Mon, 26 Jan 2015 15:40:29 +0100 Subject: QQuickTextItem: fix crash on polishing The "d->extra" pointer is lazily allocated, hence we must check if it's valid before dereferencing it. Task-number: QTBUG-44128 Change-Id: Id69c91e889193b0e9b73ed178c0ff3b13003227f Reviewed-by: Eskil Abrahamsen Blomfeldt Reviewed-by: J-P Nurmi --- src/quick/items/qquicktext.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index be86b2976b..51ae5ee93c 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -2737,7 +2737,7 @@ void QQuickText::invalidateFontCaches() { Q_D(QQuickText); - if (d->richText && d->extra->doc != 0) { + if (d->richText && d->extra.isAllocated() && d->extra->doc != 0) { QTextBlock block; for (block = d->extra->doc->firstBlock(); block.isValid(); block = block.next()) { if (block.layout() != 0 && block.layout()->engine() != 0) -- cgit v1.2.3 From aebdf4649934e65bdab94d799da5afb2da145a37 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 30 Jan 2015 09:54:53 +0100 Subject: Add list of changes for 5.4.1 relative to 5.4.0 Change-Id: I2ea7f237ffb4af6445e62178f824421104be1f1d Reviewed-by: Robin Burchell Reviewed-by: J-P Nurmi --- dist/changes-5.4.1 | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 dist/changes-5.4.1 diff --git a/dist/changes-5.4.1 b/dist/changes-5.4.1 new file mode 100644 index 0000000000..c66f7e651f --- /dev/null +++ b/dist/changes-5.4.1 @@ -0,0 +1,50 @@ +Qt 5.4.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.4.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + + http://doc.qt.io/qt-5.4 + +The Qt version 5.4 series is binary compatible with the 5.3.x series. +Applications compiled for 5.3 will continue to run with 5.4. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + http://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Library * +**************************************************************************** + + +Qt Quick +-------- + + - [QTBUG-42148] Fixed uncommon artifacts in rendering of distance field + glyphs. + - [QTBUG-43063] Setting item as its own parent should error out instead of + hanging. + - [QTBUG-43104] Add retina support in AnimatedImage. + - [QTBUG-42677] Add input method support to QQuickWidget. + - [QTBUG-42050] Fix Text alignment when lineHeight is set. + +QtQml +----- + + - [QTBUG-42831] Fix inspecting objects in QML/JS console in different + frames. + - Fixed invalidly opportunistic truncating of non-integer values for + additions/subtractions/multiplications in JavaScript and binding + expressions. + - [QTBUG-38011] Fix JavaScript Date parsing to correctly accept RC2822 + dates. + + - Windows: + * [QTBUG-43171] V4 JIT was re-enabled after it was disabled by mistake + in 5.4.0. + -- cgit v1.2.3