diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp index 3bb73b635a82b7d1571a9db56d5953dd86b7eeef..611ec33f3b826e2e8223ab96cc513c5e7fd1190f 100644 --- a/src/plugins/coreplugin/editormanager/editorview.cpp +++ b/src/plugins/coreplugin/editormanager/editorview.cpp @@ -176,6 +176,12 @@ void EditorView::showEditorInfoBar(const QString &id, m_infoWidgetLabel->setText(infoText); m_infoWidgetButton->setText(buttonText); + if (object && !buttonText.isEmpty()) { + m_infoWidgetButton->show(); + } else { + m_infoWidgetButton->hide(); + } + m_infoWidgetButton->disconnect(); if (object && buttonPressMember) connect(m_infoWidgetButton, SIGNAL(clicked()), object, buttonPressMember); diff --git a/src/plugins/qmljsinspector/qmljslivetextpreview.cpp b/src/plugins/qmljsinspector/qmljslivetextpreview.cpp index ee660d28695e9204754bedd4ad9169656b9b2475..6abf9d66c40675b0b29558a3e59a24f345c7dc1b 100644 --- a/src/plugins/qmljsinspector/qmljslivetextpreview.cpp +++ b/src/plugins/qmljsinspector/qmljslivetextpreview.cpp @@ -584,7 +584,7 @@ void QmlJSLiveTextPreview::showSyncWarning(UnsyncronizableChangeType unsyncroniz errorMessage.append(tr("You can continue debugging, but behavior can be unexpected.")); - em->showEditorInfoBar(Constants::INFO_OUT_OF_SYNC, errorMessage, tr("Reload"), this, SLOT(reloadQmlViewer())); + em->showEditorInfoBar(Constants::INFO_OUT_OF_SYNC, errorMessage); } void QmlJSLiveTextPreview::reloadQmlViewer()