feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.5' into master

Browse Source 
Change-Id: Ibcdd1230b40d1ca7a414843ee0f9ae4cddb29f6f
This commit is contained in:
Orgad Shaneh
2017-10-17 20:00:44 +03:00
parent 5c554c0de9 aa4e05f07b
commit 371b2bbbab
128 changed files with 412 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/debugger/qml/qmlcppengine.cpp
View File

@@ -337,13 +337,7 @@ void QmlCppEngine::continueInferior()
void QmlCppEngine::interruptInferior()
{
EDEBUG("\nMASTER INTERRUPT INFERIOR");
m_cppEngine->requestInterruptInferior();
}
void QmlCppEngine::requestInterruptInferior()
{
EDEBUG("\nMASTER REQUEST INTERRUPT INFERIOR");
DebuggerEngine::requestInterruptInferior();
m_activeEngine->interruptInferior();
}
void QmlCppEngine::executeRunToLine(const ContextData &data)
@@ -380,8 +374,8 @@ void QmlCppEngine::setupEngine()
void QmlCppEngine::setupInferior()
{
EDEBUG("\nMASTER SETUP INFERIOR");
m_qmlEngine->setupSlaveInferior();
m_cppEngine->setupSlaveInferior();
m_qmlEngine->setupInferior();
m_cppEngine->setupInferior();
}
void QmlCppEngine::runEngine()

1
src/plugins/debugger/qml/qmlcppengine.h
View File

@@ -98,7 +98,6 @@ protected:
void executeReturn() override;
void continueInferior() override;
void interruptInferior() override;
void requestInterruptInferior() override;
void executeRunToLine(const ContextData &data) override;
void executeRunToFunction(const QString &functionName) override;

8
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -871,9 +871,13 @@ bool QmlEngine::canHandleToolTip(const DebuggerToolTipContext &) const
}
void QmlEngine::assignValueInDebugger(WatchItem *item,
const QString &expression, const QVariant &value)
const QString &expression, const QVariant &editValue)
{
if (!expression.isEmpty()) {
QVariant value = (editValue.type() == QVariant::String)
? QVariant('"' + editValue.toString().replace('"', "\\\"") + '"')
: editValue;
if (item->isInspect()) {
d->inspectorAgent.assignValue(item, expression, value);
} else {
@@ -882,7 +886,7 @@ void QmlEngine::assignValueInDebugger(WatchItem *item,
if (handler->isContentsValid() && handler->currentFrame().isUsable()) {
d->evaluate(exp, -1, [this](const QVariantMap &) { d->updateLocals(); });
} else {
showMessage(QString("Cannot evaluate %1 in current stack frame")
showMessage(tr("Cannot evaluate %1 in current stack frame.")
.arg(expression), ConsoleOutput);
}
}

4
src/plugins/debugger/qml/qmlinspectoragent.cpp
View File

@@ -176,10 +176,6 @@ void QmlInspectorAgent::assignValue(const WatchItem *data,
if (data->id != WatchItem::InvalidId) {
QString val(valueV.toString());
if (valueV.type() == QVariant::String) {
val = val.replace(QLatin1Char('\"'), QLatin1String("\\\""));
val = QLatin1Char('\"') + val + QLatin1Char('\"');
}
QString expression = QString("%1 = %2;").arg(expr).arg(val);
queryExpressionResult(data->id, expression);
}