diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-08-30 16:56:14 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-02 08:33:02 +0200 |
| commit | 64e49f778c4e147eb24b4ad066d353a422f1f631 (patch) | |
| tree | 39842c99060073932b25c28ec07d1156ead60421 /src | |
| parent | 275d7635db0eca214357dfa5d5c0d107dbaa01dc (diff) | |
Fix bad cast from non-const QMap iterator to const_iterator
At that point in the ARM unwinder, the non-POD QMap global static (!)
is not const, so QMap::lowerBound returns a regular iterator.
Change-Id: Ia4dad7ee1a9cf593b0e1d273d193337fac7d9b69
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/jsruntime/qv4unwindhelper_p-arm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4unwindhelper_p-arm.h b/src/qml/jsruntime/qv4unwindhelper_p-arm.h index 740e6c8ca0..fb3f8040a4 100644 --- a/src/qml/jsruntime/qv4unwindhelper_p-arm.h +++ b/src/qml/jsruntime/qv4unwindhelper_p-arm.h @@ -73,7 +73,7 @@ static QMap<quintptr, Function*> allFunctions; static Function *lookupFunction(void *pc) { quintptr key = reinterpret_cast<quintptr>(pc); - QMap<quintptr, Function*>::ConstIterator it = allFunctions.lowerBound(key); + QMap<quintptr, Function*>::Iterator it = allFunctions.lowerBound(key); if (it != allFunctions.begin() && allFunctions.count() > 0) --it; if (it == allFunctions.end()) |