diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-08-06 13:09:02 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-08-06 13:09:02 (GMT) |
| commit | 8bf7fbcc4f4e2cc5d9d9f0dc38a6e336d2fcc143 (patch) | |
| tree | 4f19a338ad94e70992a95166544afacac45ef2e1 /src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp | |
| parent | d8ecf6b6f6b6c0f532a4c9f25bcd36e808dc0d2a (diff) | |
| parent | b738719a192c49f9bab64cebfa2bad67b9630870 (diff) | |
| download | Qt-8bf7fbcc4f4e2cc5d9d9f0dc38a6e336d2fcc143.zip Qt-8bf7fbcc4f4e2cc5d9d9f0dc38a6e336d2fcc143.tar.gz Qt-8bf7fbcc4f4e2cc5d9d9f0dc38a6e336d2fcc143.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Conflicts:
src/dbus/qdbusmacros.h
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp')
| -rw-r--r-- | src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp b/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp index 568af59..7616148 100644 --- a/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp +++ b/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp @@ -229,11 +229,11 @@ QScriptDebuggerResponse QScriptDebuggerCommandExecutor::execute( case QScriptDebuggerCommand::ScriptsCheckpoint: backend->scriptsCheckpoint(); - response.setResult(qVariantFromValue(backend->scriptsDelta())); + response.setResult(QVariant::fromValue(backend->scriptsDelta())); break; case QScriptDebuggerCommand::GetScriptsDelta: - response.setResult(qVariantFromValue(backend->scriptsDelta())); + response.setResult(QVariant::fromValue(backend->scriptsDelta())); break; case QScriptDebuggerCommand::ResolveScript: @@ -302,7 +302,7 @@ QScriptDebuggerResponse QScriptDebuggerCommandExecutor::execute( } break; case QScriptDebuggerCommand::ContextsCheckpoint: { - response.setResult(qVariantFromValue(backend->contextsCheckpoint())); + response.setResult(QVariant::fromValue(backend->contextsCheckpoint())); } break; case QScriptDebuggerCommand::GetPropertyExpressionValue: { @@ -441,7 +441,7 @@ QScriptDebuggerResponse QScriptDebuggerCommandExecutor::execute( result.addedProperties.append(dest); } backend->setIgnoreExceptions(didIgnoreExceptions); - response.setResult(qVariantFromValue(result)); + response.setResult(QVariant::fromValue(result)); } break; case QScriptDebuggerCommand::DeleteScriptObjectSnapshot: { |