diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-05-01 00:59:47 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-05-01 00:59:47 (GMT) |
| commit | 05ddcb4d40a56878e45bf6a06dd178217fa534f1 (patch) | |
| tree | bbce506301799e4767a7ebb347286052da7512de /src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp | |
| parent | 6e0e3c7312bbceef69e61b745d88076224745a33 (diff) | |
| parent | 1092ef425b9ed5835e4863c5ec32f9fc21af8d4d (diff) | |
| download | Qt-05ddcb4d40a56878e45bf6a06dd178217fa534f1.zip Qt-05ddcb4d40a56878e45bf6a06dd178217fa534f1.tar.gz Qt-05ddcb4d40a56878e45bf6a06dd178217fa534f1.tar.bz2 | |
Merge branch 'shader-api' into gl2engine-new-shaders
Conflicts:
src/opengl/opengl.pro
src/opengl/qglextensions.cpp
src/opengl/qglextensions_p.h
src/opengl/qglshaderprogram.cpp
src/opengl/qglshaderprogram.h
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); |