From 204970fc0ca21538b04fe54f5795738843788c88 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 21 Mar 2017 17:03:17 +0100 Subject: [PATCH] QmlDesigner: Only show warnings when opening document Otherwise the warnings become too annoying, since they are also triggered by undo/redo. Do not disable the form editor in case of warnings. Task-number: QTCREATORBUG-16306 Change-Id: Ieb1d6072269935e420e9cf988c900e1af792686f Reviewed-by: Tim Jenssen --- .../qmldesigner/components/formeditor/formeditorview.cpp | 3 --- .../qmldesigner/components/formeditor/formeditorwidget.cpp | 2 -- 2 files changed, 5 deletions(-) diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp index af1ffeebd38..fc37d0b99b6 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp @@ -307,9 +307,6 @@ void FormEditorView::documentMessagesChanged(const QList &error formEditorWidget()->showErrorMessageBox(errors); else formEditorWidget()->hideErrorMessageBox(); - - if (!warnings.isEmpty()) - formEditorWidget()->showWarningMessageBox(warnings); } void FormEditorView::customNotification(const AbstractView * /*view*/, const QString &identifier, const QList &/*nodeList*/, const QList &/*data*/) diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp index 12bb8245e41..3c2b516746c 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp @@ -286,8 +286,6 @@ void FormEditorWidget::showWarningMessageBox(const QList &warni errorWidget()->setWarnings(warnings); errorWidget()->setVisible(true); - m_graphicsView->setDisabled(true); - m_toolBox->setDisabled(true); } ZoomAction *FormEditorWidget::zoomAction() const