diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-06 11:36:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-06 11:36:18 (GMT) |
| commit | b738719a192c49f9bab64cebfa2bad67b9630870 (patch) | |
| tree | 4f19a338ad94e70992a95166544afacac45ef2e1 /src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp | |
| parent | b5946e6acd272ce96ae89fdd2fffd607a9f48770 (diff) | |
| parent | 04fe6ee36cbabf7e2a8e70f3baed026a23394b4f (diff) | |
| download | Qt-b738719a192c49f9bab64cebfa2bad67b9630870.zip Qt-b738719a192c49f9bab64cebfa2bad67b9630870.tar.gz Qt-b738719a192c49f9bab64cebfa2bad67b9630870.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Compile.
Fix recursion in QScriptEngine::toScriptValue
Deprecate qGenericMatrixFromMatrix4x4 and qGenericMatrixToMatrix4x4
Remove usage of deprecated QScriptValue* function
Deprecate qScriptValueFromQMetaObject, qScriptValueToValue, qScriptValueFromValue
Remove the use of deprecated qVariant*
Deprecate qVariantValue qVariantCanConvert qVariantFromValue qVariantSetValue
Remove the use of deprecated qFindChild(ren)
Deprecated qFindChild and qFindChildren
Implement QFontMetrics::inFont(uint) which takes UCS-4 encoded char
tst_qsharedpointer.cpp: fix compilation
Fix compilation with QT_NO_DEBUG_STREAM
QImage::fill() overloads that take QColor and Qt::GlobalColor
qmake: qmakeDeleteCacheClear() function can be template now
It is no longer necessary to check for QT_NO_MEMBER_TEMPLATES
It is no longer necessary to check for QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION
Fix MS Visual C++ 6.0 references in the documentation
Remove obsolete code & workarounds for unsupported versions of MS Visual C++
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: { |