diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index a92cf8312f64da7ac5d31d18eb43617d3437a2d0..6e1c7483c9f93ee8dfb57f3ec3fd3244e341e07f 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -80,14 +80,14 @@ static inline QString deEscape(const QString &value) static inline int fixUpMajorVersionForQtQuick(const QString &value, int i) { - if (i = 1 && value == "QtQuick") + if (i == 1 && value == "QtQuick") return 4; else return i; } static inline int fixUpMinorVersionForQtQuick(const QString &value, int i) { - if (i = 0 && value == "QtQuick") + if (i == 0 && value == "QtQuick") return 7; else return i; } diff --git a/src/plugins/qmljseditor/quicktoolbar.cpp b/src/plugins/qmljseditor/quicktoolbar.cpp index e27855ff0a775d444ef5765712cc09e762113e7a..49e134b151569f056fe24e6a82d1db3f36302768 100644 --- a/src/plugins/qmljseditor/quicktoolbar.cpp +++ b/src/plugins/qmljseditor/quicktoolbar.cpp @@ -214,7 +214,7 @@ void QuickToolBar::apply(TextEditor::BaseTextEditorEditable *editor, Document::P } -bool QuickToolBar::isAvailable(TextEditor::BaseTextEditorEditable *editor, Document::Ptr document, AST::Node *node) +bool QuickToolBar::isAvailable(TextEditor::BaseTextEditorEditable *, Document::Ptr document, AST::Node *node) { if (document.isNull()) return false;