4 files changed, 18 insertions, 7 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 863ac30..b1f36be 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -993,7 +993,7 @@ void QScriptEnginePrivate::setDefaultPrototype(int metaTypeId, JSC::JSValue prot
 
 QScriptContext *QScriptEnginePrivate::contextForFrame(JSC::ExecState *frame)
 {
-    if (frame && frame->callerFrame()->hasHostCallFrameFlag()
+    if (frame && frame->callerFrame()->hasHostCallFrameFlag() && !frame->callee()
         && frame->callerFrame()->removeHostCallFrameFlag() == QScript::scriptEngineFromExec(frame)->globalExec()) {
         //skip the "fake" context created in Interpreter::execute.
         frame = frame->callerFrame()->removeHostCallFrameFlag();
diff --git a/src/script/api/qscriptstring.cpp b/src/script/api/qscriptstring.cpp
index 65bd818..2fb157f 100644
--- a/src/script/api/qscriptstring.cpp
+++ b/src/script/api/qscriptstring.cpp
@@ -150,14 +150,8 @@ bool QScriptString::isValid() const
 bool QScriptString::operator==(const QScriptString &other) const
 {
     Q_D(const QScriptString);
-    if (d == other.d_func())
-        return true;
     if (!d || !other.d_func())
         return d == other.d_func();
-    if (d->engine != other.d_func()->engine)
-        return false;
-    if (!d->engine)
-        return true;
     return d->identifier == other.d_func()->identifier;
 }
 
@@ -195,4 +189,12 @@ QScriptString::operator QString() const
     return toString();
 }
 
+uint qHash(const QScriptString &key)
+{
+    QScriptStringPrivate *d = QScriptStringPrivate::get(key);
+    if (!d)
+        return 0;
+    return qHash(d->identifier.ustring().rep());
+}
+
 QT_END_NAMESPACE
diff --git a/src/script/api/qscriptstring.h b/src/script/api/qscriptstring.h
index e0a808e..40d156c 100644
--- a/src/script/api/qscriptstring.h
+++ b/src/script/api/qscriptstring.h
@@ -76,6 +76,8 @@ private:
     Q_DECLARE_PRIVATE(QScriptString)
 };
 
+Q_SCRIPT_EXPORT uint qHash(const QScriptString &key);
+
 QT_END_NAMESPACE
 
 QT_END_HEADER
diff --git a/src/script/api/qscriptstring_p.h b/src/script/api/qscriptstring_p.h
index 25ce702..d3bb47d 100644
--- a/src/script/api/qscriptstring_p.h
+++ b/src/script/api/qscriptstring_p.h
@@ -73,6 +73,8 @@ public:
     inline ~QScriptStringPrivate();
     static inline void init(QScriptString &q, QScriptStringPrivate *d);
 
+    static inline QScriptStringPrivate *get(const QScriptString &q);
+
     inline void detachFromEngine();
 
     QBasicAtomicInt ref;
@@ -101,6 +103,11 @@ inline void QScriptStringPrivate::init(QScriptString &q, QScriptStringPrivate *d
     q.d_ptr = d;
 }
 
+inline QScriptStringPrivate *QScriptStringPrivate::get(const QScriptString &q)
+{
+    return const_cast<QScriptStringPrivate*>(q.d_func());
+}
+
 inline void QScriptStringPrivate::detachFromEngine()
 {
     engine = 0;