From c0f98299dfec442d71c57da49df84510247fa0be Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Thu, 8 Mar 2018 16:15:02 +0100
Subject: [PATCH] QmlDesigner: Fix build

Fixes an error and a warning, and removes a local inconsistency
regarding "void static" vs "static void".

Change-Id: I1685823162290cb7d5f2df9cef6e32928fbf0a32
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../qmldesigner/designercore/model/rewriterview.cpp       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
index a5f036c49b3..64e69a2d119 100644
--- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
+++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
@@ -472,7 +472,7 @@ QString RewriterView::auxiliaryDataAsQML() const
             for (auto i = data.begin(); i != data.end(); ++i) {
                 const QVariant value = i.value();
                 QString strValue = value.toString();
-                if (value.type() == QMetaType::QString)
+                if (static_cast<QMetaType::Type>(value.type()) == QMetaType::QString)
                     strValue = "\"" + strValue + "\"";
 
                 if (!strValue.isEmpty()) {
@@ -933,14 +933,14 @@ void RewriterView::writeAuxiliaryData()
     }
 }
 
-void checkNode(QmlJS::SimpleReaderNode::Ptr node, RewriterView *view);
+static void checkNode(QmlJS::SimpleReaderNode::Ptr node, RewriterView *view);
 
-void static checkChildNodes(QmlJS::SimpleReaderNode::Ptr node, RewriterView *view)
+static void checkChildNodes(QmlJS::SimpleReaderNode::Ptr node, RewriterView *view)
 {
     for (auto child : node->children())
         checkNode(child, view);
 }
-void static checkNode(QmlJS::SimpleReaderNode::Ptr node, RewriterView *view)
+static void checkNode(QmlJS::SimpleReaderNode::Ptr node, RewriterView *view)
 {
     if (!node)
         return;