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

Merge remote-tracking branch 'origin/4.10'

Browse Source 
Change-Id: Iaf27911e4e9fb762c1a24c84c458462bafe95728
This commit is contained in:
Tim Jenssen
2019-07-12 15:53:56 +02:00
parent f7520b7d99 51cd2885ef
commit 333b33edbe
126 changed files with 9456 additions and 6532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -320,7 +320,7 @@ QmlEngine::~QmlEngine()
if (textEditPtr)
documentsToClose << textEditPtr.data()->document();
}
EditorManager::closeDocuments(documentsToClose.toList());
EditorManager::closeDocuments(Utils::toList(documentsToClose));
delete d;
}

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

@@ -260,7 +260,8 @@ void QmlInspectorAgent::onResult(quint32 queryId, const QVariant &value,
} else {
int index = m_rootContextQueryIds.indexOf(queryId);
if (index < 0) {
m_qmlEngine->expressionEvaluated(queryId, value);
if (QTC_GUARD(m_qmlEngine))
m_qmlEngine->expressionEvaluated(queryId, value);
} else {
Q_ASSERT(index < m_engines.length());
const int engineId = m_engines.at(index).debugId();