diff options
| author | Jarek Kobus <jkobus@trolltech.com> | 2009-04-17 06:59:50 (GMT) |
|---|---|---|
| committer | Jarek Kobus <jkobus@trolltech.com> | 2009-04-17 06:59:50 (GMT) |
| commit | fa58c0e9afecc3807bd76babbd5da3918afcdd3d (patch) | |
| tree | 4895431d492b093b1e2ee29032fa82999a8ed09b /src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp | |
| parent | 04c01e15739d926ef653293ef1e89132085d7acd (diff) | |
| parent | 8eb08c8c294f00763961e86cc3370b0ef78c8976 (diff) | |
| download | Qt-fa58c0e9afecc3807bd76babbd5da3918afcdd3d.zip Qt-fa58c0e9afecc3807bd76babbd5da3918afcdd3d.tar.gz Qt-fa58c0e9afecc3807bd76babbd5da3918afcdd3d.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp')
| -rw-r--r-- | src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp b/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp index 20350f6..fa30d84 100644 --- a/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp +++ b/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp @@ -410,11 +410,7 @@ void QScriptDebuggerScriptedConsoleCommandJob::start() for (int i = 0; i < d->arguments.size(); ++i) args.append(QScriptValue(engine, d->arguments.at(i))); QScriptDebuggerConsoleGlobalObject *global; -#if QT_VERSION >= 0x040500 global = qobject_cast<QScriptDebuggerConsoleGlobalObject*>(engine->globalObject().toQObject()); -#else - global = qobject_cast<QScriptDebuggerConsoleGlobalObject*>(engine->globalObject().scope().toQObject()); -#endif Q_ASSERT(global != 0); global->setScheduler(this); global->setResponseHandler(this); @@ -444,11 +440,7 @@ void QScriptDebuggerScriptedConsoleCommandJob::handleResponse( args.append(qScriptValueFromValue(engine, response)); args.append(QScriptValue(engine, commandId)); QScriptDebuggerConsoleGlobalObject *global; -#if QT_VERSION >= 0x040500 global = qobject_cast<QScriptDebuggerConsoleGlobalObject*>(engine->globalObject().toQObject()); -#else - global = qobject_cast<QScriptDebuggerConsoleGlobalObject*>(engine->globalObject().scope().toQObject()); -#endif Q_ASSERT(global != 0); global->setScheduler(this); global->setResponseHandler(this); @@ -566,12 +558,7 @@ QScriptDebuggerScriptedConsoleCommand *QScriptDebuggerScriptedConsoleCommand::pa QScriptDebuggerConsoleGlobalObject *cppGlobal = new QScriptDebuggerConsoleGlobalObject(); QScriptValue global = engine->newQObject(cppGlobal, QScriptEngine::ScriptOwnership, -#if QT_VERSION >= 0x040500 QScriptEngine::ExcludeSuperClassContents); -#else - QScriptEngine::ExcludeSuperClassMethods - | QScriptEngine::ExcludeSuperClassProperties); -#endif { QScriptValueIterator it(engine->globalObject()); while (it.hasNext()) { @@ -579,12 +566,7 @@ QScriptDebuggerScriptedConsoleCommand *QScriptDebuggerScriptedConsoleCommand::pa global.setProperty(it.scriptName(), it.value(), it.flags()); } } -#if QT_VERSION >= 0x040500 engine->setGlobalObject(global); -#else - engine->globalObject().setScope(global); - global = engine->globalObject(); -#endif cppGlobal->setMessageHandler(messageHandler); QScriptValue ret = engine->evaluate(program, fileName); |