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

Merge remote-tracking branch 'origin/4.5'

Browse Source 
Conflicts:
	src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
	src/plugins/qmlprofiler/qmlprofilertraceclient.cpp

Change-Id: I94647f59d7a9df48168ac066555afe80f5f9b91f
This commit is contained in:
Oswald Buddenhagen
2017-12-21 13:20:24 +01:00
parent 6e0b65a11c c14684ffc9
commit 777ca8e655
22 changed files with 84 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/documentwarningwidget.cpp
View File

@@ -126,7 +126,7 @@ void DocumentWarningWidget::refreshContent()
}
QString messageString;
DocumentMessage message = m_messages.at(m_currentMessage);
DocumentMessage message = m_messages.value(m_currentMessage);
if (message.type() == DocumentMessage::ParseError) {
messageString += errorToString(message);
m_navigateLabel->setText(generateNavigateLinks());