diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-08-22 00:11:16 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-22 02:04:39 +0200 |
| commit | c374f4441ab42d1849431bb42fec91a976a8e502 (patch) | |
| tree | 0733146c5df48b91a39097730c445dbe9cd2359a /src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp | |
| parent | 85b24bb2dea97c3a9b013bacd5a422b26fe5d14b (diff) | |
| parent | c8ca300e491c186304d0864a9e870337e891e6f7 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp')
| -rw-r--r-- | src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp index 433c9eec37..611b9fdd9b 100644 --- a/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp +++ b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp @@ -169,11 +169,11 @@ static bool isDuplicate(const QComposeTableElement &lhs, const QComposeTableElem bool QComposeInputContext::checkComposeTable() { - QList<QComposeTableElement>::iterator it = - qLowerBound(m_composeTable.begin(), m_composeTable.end(), m_composeBuffer, Compare()); + QVector<QComposeTableElement>::const_iterator it = + qLowerBound(m_composeTable.constBegin(), m_composeTable.constEnd(), m_composeBuffer, Compare()); // prevent dereferencing an 'end' iterator, which would result in a crash - if (it == m_composeTable.end()) + if (it == m_composeTable.constEnd()) it -= 1; QComposeTableElement elem = *it; |