summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSérgio Martins <sergio.martins@kdab.com>2016-01-05 15:30:34 +0000
committerSérgio Martins <iamsergio@gmail.com>2016-01-05 16:36:02 +0000
commit49f9797d2a2aab245a9866bc4563812a6e8c02e1 (patch)
tree2fa00b2e4f6a4188abec62c32ff8cf1d8c0a0400
parent8b9ab5e06e589cc7a252f7af9e945c38f8d25ada (diff)
Fix a couple of container detachments
Change-Id: I0def20d858de7721771702907b7a431b5fb90a1f Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
-rw-r--r--src/qml/jit/qv4regalloc.cpp2
-rw-r--r--src/qml/jsruntime/qv4engine.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jit/qv4regalloc.cpp b/src/qml/jit/qv4regalloc.cpp
index 5e836f06f1..d1d97c8f84 100644
--- a/src/qml/jit/qv4regalloc.cpp
+++ b/src/qml/jit/qv4regalloc.cpp
@@ -946,7 +946,7 @@ private:
return;
while (!_unprocessed.isEmpty()) {
- const LifeTimeInterval *i = _unprocessed.first();
+ const LifeTimeInterval *i = _unprocessed.constFirst();
if (i->start() > position)
break;
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index e31d9b1481..d74575da03 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -1102,7 +1102,7 @@ QQmlError ExecutionEngine::catchExceptionAsQmlError()
QV4::ScopedValue exception(scope, catchException(&trace));
QQmlError error;
if (!trace.isEmpty()) {
- QV4::StackFrame frame = trace.first();
+ QV4::StackFrame frame = trace.constFirst();
error.setUrl(QUrl(frame.source));
error.setLine(frame.line);
error.setColumn(frame.column);