1 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/compiler/qv4compileddata.cpp b/src/qml/compiler/qv4compileddata.cpp
index 4d0361302e..ded2c1a9f8 100644
--- a/src/qml/compiler/qv4compileddata.cpp
+++ b/src/qml/compiler/qv4compileddata.cpp
@@ -72,6 +72,9 @@ CompilationUnit::CompilationUnit()
 CompilationUnit::~CompilationUnit()
 {
     unlink();
+    if (data && !(data->flags & QV4::CompiledData::Unit::StaticData))
+        free(data);
+    data = 0;
 }
 
 QV4::Function *CompilationUnit::linkToEngine(ExecutionEngine *engine)
@@ -163,9 +166,6 @@ void CompilationUnit::unlink()
     if (engine)
         engine->compilationUnits.erase(engine->compilationUnits.find(this));
     engine = 0;
-    if (data && !(data->flags & QV4::CompiledData::Unit::StaticData))
-        free(data);
-    data = 0;
     free(runtimeStrings);
     runtimeStrings = 0;
     delete [] runtimeLookups;
@@ -221,8 +221,8 @@ QString Binding::valueAsString(const Unit *unit) const
         // This code must match that in the qsTr() implementation
         const QString &path = unit->stringAt(unit->sourceFileIndex);
         int lastSlash = path.lastIndexOf(QLatin1Char('/'));
-        QString context = (lastSlash > -1) ? path.mid(lastSlash + 1, path.length()-lastSlash-5) :
-                                             QString();
+        QStringRef context = (lastSlash > -1) ? path.midRef(lastSlash + 1, path.length() - lastSlash - 5)
+                                              : QStringRef();
         QByteArray contextUtf8 = context.toUtf8();
         QByteArray comment = unit->stringAt(value.translationData.commentIndex).toUtf8();
         QByteArray text = unit->stringAt(stringIndex).toUtf8();