diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-12-21 13:20:24 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-12-21 13:20:24 +0100 |
commit | 777ca8e655cf3561b1386baf0537fa252e016d23 (patch) | |
tree | 43e155d8e06df56d60aa85d0a21ee82897a4b59d /src/plugins/qmldesigner/documentwarningwidget.cpp | |
parent | 6e0b65a11ccc50b0631e7e770a5acbd9163cf362 (diff) | |
parent | c14684ffc997809c63310699e1c9edd53a8e7448 (diff) |
Merge remote-tracking branch 'origin/4.5'
Conflicts:
src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
src/plugins/qmlprofiler/qmlprofilertraceclient.cpp
Change-Id: I94647f59d7a9df48168ac066555afe80f5f9b91f
Diffstat (limited to 'src/plugins/qmldesigner/documentwarningwidget.cpp')
-rw-r--r-- | src/plugins/qmldesigner/documentwarningwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/documentwarningwidget.cpp b/src/plugins/qmldesigner/documentwarningwidget.cpp index 91c4e55e12..a6c0303464 100644 --- a/src/plugins/qmldesigner/documentwarningwidget.cpp +++ b/src/plugins/qmldesigner/documentwarningwidget.cpp @@ -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()); |