From 64e49f778c4e147eb24b4ad066d353a422f1f631 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Fri, 30 Aug 2013 16:56:14 -0700
Subject: 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>
---
 src/qml/jsruntime/qv4unwindhelper_p-arm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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())
-- 
cgit v1.2.3