From b9f699f9576875b4f760fbb70cb198e06add168f Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 23 Jun 2016 17:03:40 +0200 Subject: [PATCH] QmlDesigner: take the setting into account This was a regression after the merge of error/warning dialog. Change-Id: I6bd9d2e81d118018a40745a98e67b1bff8f84d4f Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/qmldesignerplugin.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index 0ef7f450b7d..60fd2b77ff7 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -307,6 +307,12 @@ static bool warningsForQmlFilesInsteadOfUiQmlEnabled() return settings.value(DesignerSettingsKey::WARNING_FOR_QML_FILES_INSTEAD_OF_UIQML_FILES).toBool(); } +static bool showWarningsForFeaturesInDesigner() +{ + DesignerSettings settings = QmlDesignerPlugin::instance()->settings(); + return settings.value(DesignerSettingsKey::WARNING_FOR_FEATURES_IN_DESIGNER).toBool(); +} + void QmlDesignerPlugin::showDesigner() { QTC_ASSERT(!d->documentManager.hasCurrentDesignDocument(), return); @@ -425,7 +431,7 @@ void QmlDesignerPlugin::activateAutoSynchronization() selectModelNodeUnderTextCursor(); d->mainWidget->enableWidgets(); d->mainWidget->setupNavigatorHistory(currentDesignDocument()->textEditor()); - if (currentDesignDocument()->hasQmlParseWarnings()) + if (showWarningsForFeaturesInDesigner() && currentDesignDocument()->hasQmlParseWarnings()) d->mainWidget->showWarningMessageBox(currentDesignDocument()->qmlParseWarnings()); } else { d->mainWidget->disableWidgets();