QmlDebugger: removed "Reload" button on live preview error

Reviewed-by:  Kai Koehne

diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp
index 3bb73b6..611ec33 100644 (file)
--- 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 ee660d2..6abf9d6 100644 (file)
--- 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()