aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2017-03-21 17:03:17 +0100
committerTim Jenssen <tim.jenssen@qt.io>2017-03-21 16:40:16 +0000
commit204970fc0ca21538b04fe54f5795738843788c88 (patch)
tree201e1495c0d9de3db11a1eebdbfb6bff6b396493
parente8b3b8140bd5d1ce6dc5b3874c508643656928f7 (diff)
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 <tim.jenssen@qt.io>
-rw-r--r--src/plugins/qmldesigner/components/formeditor/formeditorview.cpp3
-rw-r--r--src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp2
2 files changed, 0 insertions, 5 deletions
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
index af1ffeebd3..fc37d0b99b 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<DocumentMessage> &error
formEditorWidget()->showErrorMessageBox(errors);
else
formEditorWidget()->hideErrorMessageBox();
-
- if (!warnings.isEmpty())
- formEditorWidget()->showWarningMessageBox(warnings);
}
void FormEditorView::customNotification(const AbstractView * /*view*/, const QString &identifier, const QList<ModelNode> &/*nodeList*/, const QList<QVariant> &/*data*/)
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
index 12bb8245e4..3c2b516746 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<DocumentMessage> &warni
errorWidget()->setWarnings(warnings);
errorWidget()->setVisible(true);
- m_graphicsView->setDisabled(true);
- m_toolBox->setDisabled(true);
}
ZoomAction *FormEditorWidget::zoomAction() const