Fix bad cast from non-const QMap iterator to const_iterator
authorThiago Macieira <thiago.macieira@intel.com>
Fri, 30 Aug 2013 23:56:14 +0000 (16:56 -0700)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 2 Sep 2013 06:33:02 +0000 (08:33 +0200)
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>
src/qml/jsruntime/qv4unwindhelper_p-arm.h

index 740e6c8..fb3f804 100644 (file)
@@ -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())