From 490bf800e645c4f9c3321315894cdfe57afb2044 Mon Sep 17 00:00:00 2001 From: Jan Arve Saether Date: Fri, 9 Aug 2013 16:14:10 +0200 Subject: Avoid a potential crash in unignoredChildren This doesn't actually fix the source of the problem, but its harmless. This was reproduced with tst_qcolumnview and voiceover enabled Task-number: QTBUG-32440 Change-Id: Iad27884e1ca9194f911271c16908ef358e4b1875 Reviewed-by: Frederik Gladhorn --- src/plugins/platforms/cocoa/qcocoaaccessibility.mm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibility.mm b/src/plugins/platforms/cocoa/qcocoaaccessibility.mm index 5649f3ad73..e135f36e78 100644 --- a/src/plugins/platforms/cocoa/qcocoaaccessibility.mm +++ b/src/plugins/platforms/cocoa/qcocoaaccessibility.mm @@ -231,8 +231,7 @@ NSArray *unignoredChildren(id parentObject, QAccessibleInterface *interface) NSMutableArray *kids = [NSMutableArray arrayWithCapacity:numKids]; for (int i = 0; i < numKids; ++i) { QAccessibleInterface *child = interface->child(i); - Q_ASSERT(child); - if (child->state().invalid || child->state().invisible) + if (!child || !child->isValid() || child->state().invalid || child->state().invisible) continue; QAccessible::Id childId = QAccessible::uniqueId(child); -- cgit v1.2.3 From 5b32132762cdaeb558833d5e36629b4248d4be48 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Tue, 13 Aug 2013 22:13:30 +0200 Subject: Fix escaped compose key parsing This patch fixes the issue when the escape '\' character was interpreted as a compose value. On the whole en_US.UTF-8 Compose file it only affects the following sequences: : "\"" quotedbl # REVERSE SOLIDUS : "\\" backslash # REVERSE SOLIDUS : "\\" backslash # REVERSE SOLIDUS : "\\" backslash # REVERSE SOLIDUS By coincidence the last 3 sequences were working even before this fix. Task-number: QTBUG-32972 Change-Id: Ia4fc2156d982cf2918d0d1be6ee07706cfbfd091 Reviewed-by: Thiago Macieira Reviewed-by: Lars Knoll --- .../platforminputcontexts/compose/generator/qtablegenerator.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/plugins') diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp index f746207cc0..803faaf08a 100644 --- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp @@ -342,7 +342,8 @@ void TableGenerator::parseKeySequence(QString line) } } else { // handle direct text encoded in the locale - elem.value = valueType.unicode(); + const QChar localeValueType = (valueType == '\\') ? line.at(composeValueIndex + 1) : valueType; + elem.value = localeValueType.unicode(); } // find the comment -- cgit v1.2.3