Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (104 commits)
  Fixed tst_maketestselftest::tests_pro_files failure
  remove nasty hack by using a stricter regexp (for language codes)
  cosmetics: quote the dot in the regexp
  remove dependency of ts targets on sub-tools
  add commit-ts target to commit ts files without line number info
  (re-)add 'untranslated' ts targets
  more fine-grained ts targets
  split qt_help out into an own ts target
  Unbreak the Maemo 5 build after the Symbian fix
  QNAM HTTP: Fix problem with cached files and metaDataChanged()
  Add a testcase for QTBUG-11213 to prevent future regressions.
  Autotest: reenable the NTLM proxy test on tst_QTcpSocket
  Autotest: add a small, boring test for QAuthenticator
  Add documentation for the QAuthenticator options.
  Expose the QAuthenticator map of options in the API.
  Add a QAuthenticatorPrivate parsing for the headers without QHttpResponseHeader
  Revert BIC change "Build Qt with option -Zc:wchar_t under MSVC"
  Fix for tst_qmdisubwindow::fixedMinMaxSize failure on Cocoa
  Add unit tests for QMimeData.
  fix qconfig.h reference for shadow builds
  ...

1 files changed, 6 insertions, 0 deletions

diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp
index 451d1b0..f6390bb 100644
--- a/src/script/api/qscriptvalue.cpp
+++ b/src/script/api/qscriptvalue.cpp
@@ -1268,6 +1268,7 @@ QDateTime QScriptValue::toDateTime() const
     Q_D(const QScriptValue);
     if (!d || !d->engine)
         return QDateTime();
+    QScript::APIShim shim(d->engine);
     return QScriptEnginePrivate::toDateTime(d->engine->currentFrame, d->jscValue);
 }
 
@@ -1284,6 +1285,7 @@ QRegExp QScriptValue::toRegExp() const
     Q_D(const QScriptValue);
     if (!d || !d->engine)
          return QRegExp();
+    QScript::APIShim shim(d->engine);
     return QScriptEnginePrivate::toRegExp(d->engine->currentFrame, d->jscValue);
 }
 #endif // QT_NO_REGEXP
@@ -1303,6 +1305,7 @@ QObject *QScriptValue::toQObject() const
     Q_D(const QScriptValue);
     if (!d || !d->engine)
         return 0;
+    QScript::APIShim shim(d->engine);
     return QScriptEnginePrivate::toQObject(d->engine->currentFrame, d->jscValue);
 }
 
@@ -1317,6 +1320,7 @@ const QMetaObject *QScriptValue::toQMetaObject() const
     Q_D(const QScriptValue);
     if (!d || !d->engine)
         return 0;
+    QScript::APIShim shim(d->engine);
     return QScriptEnginePrivate::toQMetaObject(d->engine->currentFrame, d->jscValue);
 }
 
@@ -1407,6 +1411,7 @@ QScriptValue QScriptValue::property(quint32 arrayIndex,
     Q_D(const QScriptValue);
     if (!d || !d->isObject())
         return QScriptValue();
+    QScript::APIShim shim(d->engine);
     return d->engine->scriptValueFromJSCValue(d->property(arrayIndex, mode));
 }
 
@@ -1434,6 +1439,7 @@ void QScriptValue::setProperty(quint32 arrayIndex, const QScriptValue &value,
                  "cannot set value created in a different engine");
         return;
     }
+    QScript::APIShim shim(d->engine);
     JSC::JSValue jsValue = d->engine->scriptValueToJSCValue(value);
     d->setProperty(arrayIndex, jsValue, flags);
 }