diff options
| author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2013-05-27 10:14:13 +0200 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2013-05-27 10:18:47 +0200 |
| commit | f3e749ed04f750a3f01b78a20e6b05130f9b1c68 (patch) | |
| tree | c2cf7f38d87fd91d06a1bfa00e0a237dee732eba | |
| parent | 3eba7e44e5205191075a32ec2c3de3a2f1569b4f (diff) | |
| download | qt-creator-f3e749ed04f750a3f01b78a20e6b05130f9b1c68.tar.gz | |
QmlDesigner.Rewriter: bug fix
Do not show warnings if recovering from an error.
Change-Id: I748a3f7ae63eb593ddeaa5de2ebf7264a456ac7d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
| -rw-r--r-- | src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index dd2dfa2175..52e45d6075 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -802,7 +802,7 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH return false; } - if (!warnings.isEmpty() && differenceHandler.isValidator()) { + if (!warnings.isEmpty() && differenceHandler.isValidator() && !m_rewriterView->inErrorState()) { QString title = QCoreApplication::translate("QmlDesigner::TextToModelMerger", "This .qml file contains features " "which are not supported by Qt Quick Designer"); |