From 24a76a73a94c3c6e2b92ccbc59f5f81e00d9c114 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Thu, 21 Oct 2010 17:11:43 +0200
Subject: [PATCH] fix warnings
Reviewed-by: Marco Bubke
---
.../qmldesigner/designercore/model/texttomodelmerger.cpp | 4 ++--
src/plugins/qmljseditor/quicktoolbar.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index a92cf8312f6..6e1c7483c9f 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 e27855ff0a7..49e134b1515 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;
--
GitLab