diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-17 13:43:07 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-17 13:43:07 (GMT) |
| commit | ba25514d1c1010d84ffdbf75331ff71596e56c99 (patch) | |
| tree | 0826e54b51a0727ec823be7768d3f34fb94ed6fd /src/script/bridge | |
| parent | 92daafcd4677af16d47e51ac8e0f00c554007fa0 (diff) | |
| download | Qt-ba25514d1c1010d84ffdbf75331ff71596e56c99.zip Qt-ba25514d1c1010d84ffdbf75331ff71596e56c99.tar.gz Qt-ba25514d1c1010d84ffdbf75331ff71596e56c99.tar.bz2 | |
remove unnecessary ifdefs
Diffstat (limited to 'src/script/bridge')
| -rw-r--r-- | src/script/bridge/qscriptfunction.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/script/bridge/qscriptfunction.cpp b/src/script/bridge/qscriptfunction.cpp index 396a787..27ec203 100644 --- a/src/script/bridge/qscriptfunction.cpp +++ b/src/script/bridge/qscriptfunction.cpp @@ -81,9 +81,7 @@ FunctionWrapper::~FunctionWrapper() JSC::ConstructType FunctionWrapper::getConstructData(JSC::ConstructData& consData) { consData.native.function = proxyConstruct; -#ifdef QT_BUILD_SCRIPT_LIB consData.native.function.doNotCallDebuggerFunctionExit(); -#endif return JSC::ConstructTypeHost; } @@ -118,10 +116,10 @@ JSC::JSObject* FunctionWrapper::proxyConstruct(JSC::ExecState *exec, JSC::JSObje QScriptContext *ctx = eng_p->contextForFrame(eng_p->currentFrame); QScriptValue result = self->data->function(ctx, QScriptEnginePrivate::get(eng_p)); -#ifdef QT_BUILD_SCRIPT_LIB + if (JSC::Debugger* debugger = eng_p->originalGlobalObject()->debugger()) debugger->functionExit(QScriptValuePrivate::get(result)->jscValue, -1); -#endif + if (!result.isObject()) result = ctx->thisObject(); |