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: (25 commits)
  QNAM: Fix doc rendering of QNetworkRequest
  remove the connecting thread, and use async call to dbus instead.
  QScriptValue::construct(): Don't crash if function throws non-Object
  Network code: Fix code comment spellchecking errors.
  QNAM: fix build
  QNAM HTTP: Remove the error() of QHttpNetworkConnection
  QNAM HTTP: Remove enableEncryption()
  QNAM HTTP: Remove unused code
  QNAM HTTP: Move authenticationRequired() to QHttpNetworkReply
  QNAM HTTP: Move proxyAuthenticationRequired() to QHttpNetworkReply
  QNAM HTTP: Move cacheCredentials() to QHttpNetworkReply
  QNAM HTTP: Use sslErrors() from QHttpNetworkReply
  QNAM HTTP: Remove Wait4AuthState
  QNAM: Internal function renaming
  QNAM HTTP: Internal variable spelling mistakes
  QNAM HTTP: Pause connection when emitting proxy auth signal
  QNAM HTTP: Also pause connection when emitting sslErrors()
  QNAM HTTP: Also resume uploads after connection pause
  QNAM HTTP: Process authenticationRequired() from HTTP properly
  QNAM HTTP: Pause sockets while emitting to user code.
  ...

1 files changed, 8 insertions, 5 deletions

diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp
index f6390bb..f494106 100644
--- a/src/script/api/qscriptvalue.cpp
+++ b/src/script/api/qscriptvalue.cpp
@@ -1736,10 +1736,12 @@ QScriptValue QScriptValue::construct(const QScriptValueList &args)
 
     JSC::JSValue savedException;
     QScriptEnginePrivate::saveException(exec, &savedException);
-    JSC::JSObject *result = JSC::construct(exec, callee, constructType, constructData, jscArgs);
+    JSC::JSValue result;
+    JSC::JSObject *newObject = JSC::construct(exec, callee, constructType, constructData, jscArgs);
     if (exec->hadException()) {
-        result = JSC::asObject(exec->exception());
+        result = exec->exception();
     } else {
+        result = newObject;
         QScriptEnginePrivate::restoreException(exec, savedException);
     }
     return d->engine->scriptValueFromJSCValue(result);
@@ -1796,11 +1798,12 @@ QScriptValue QScriptValue::construct(const QScriptValue &arguments)
 
     JSC::JSValue savedException;
     QScriptEnginePrivate::saveException(exec, &savedException);
-    JSC::JSObject *result = JSC::construct(exec, callee, constructType, constructData, applyArgs);
+    JSC::JSValue result;
+    JSC::JSObject *newObject = JSC::construct(exec, callee, constructType, constructData, applyArgs);
     if (exec->hadException()) {
-        if (exec->exception().isObject())
-            result = JSC::asObject(exec->exception());
+        result = exec->exception();
     } else {
+        result = newObject;
         QScriptEnginePrivate::restoreException(exec, savedException);
     }
     return d->engine->scriptValueFromJSCValue(result);