diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2022-09-22 10:32:40 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2022-09-22 10:32:40 +0200 |
| commit | 80e2eddd957bbb35a2197e5a869871017592f7a9 (patch) | |
| tree | 9818b7f7dad27fe3596cbb85b591e59b5114f8e4 /src/plugins/qmldesigner/documentwarningwidget.cpp | |
| parent | 645fce14e006387ba4e2a4befcdd25b1bc1e111c (diff) | |
| parent | fec59c21dfecc2922595e16255d9b18fd374df02 (diff) | |
Merge remote-tracking branch 'origin/8.0'
resolved conflicts:
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
src/plugins/qmldesigner/designercore/exceptions/exception.cpp
Change-Id: I13a5248415fa1ae03e1c6d0972d9b3bb8c80a3b0
Diffstat (limited to 'src/plugins/qmldesigner/documentwarningwidget.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/documentwarningwidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/documentwarningwidget.cpp b/src/plugins/qmldesigner/documentwarningwidget.cpp index 64526a1127..83fb8095f7 100644 --- a/src/plugins/qmldesigner/documentwarningwidget.cpp +++ b/src/plugins/qmldesigner/documentwarningwidget.cpp @@ -178,12 +178,12 @@ void DocumentWarningWidget::emitGotoCodeClicked(const DocumentMessage &message) bool DocumentWarningWidget::warningsEnabled() const { - return DesignerSettings::getValue(DesignerSettingsKey::WARNING_FOR_FEATURES_IN_DESIGNER).toBool(); + return QmlDesignerPlugin::settings().value(DesignerSettingsKey::WARNING_FOR_FEATURES_IN_DESIGNER).toBool(); } void DocumentWarningWidget::ignoreCheckBoxToggled(bool b) { - DesignerSettings::setValue(DesignerSettingsKey::WARNING_FOR_FEATURES_IN_DESIGNER, !b); + QmlDesignerPlugin::settings().value(DesignerSettingsKey::WARNING_FOR_FEATURES_IN_DESIGNER, !b); } void DocumentWarningWidget::setErrors(const QList<DocumentMessage> &errors) |