From e4dab6b83e607ecdac417e214e914a2cba8d0f16 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Tue, 3 Mar 2020 19:05:08 +0200
Subject: [PATCH] QmlJS: Fix compiler warning and add a missing include
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

qmljsdiagnosticmessage_p.h: In static member function ‘static QmlJS::Severity::Enum QmlJS::DiagnosticMessage::qtMsgTypeToKind(QtMsgType)’:
qmljsdiagnosticmessage_p.h:72:5: warning: control reaches end of non-void function [-Wreturn-type]
   72 |     }
      |     ^

Change-Id: I2183199bf257453e0af2998b739fae8c90f5c098
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
---
 src/libs/qmljs/parser/qmljsdiagnosticmessage_p.h | 1 +
 tests/auto/qml/codemodel/check/tst_check.cpp     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/libs/qmljs/parser/qmljsdiagnosticmessage_p.h b/src/libs/qmljs/parser/qmljsdiagnosticmessage_p.h
index 1e6e86971ce..a29d29e642e 100644
--- a/src/libs/qmljs/parser/qmljsdiagnosticmessage_p.h
+++ b/src/libs/qmljs/parser/qmljsdiagnosticmessage_p.h
@@ -67,6 +67,7 @@ public:
         case QtFatalMsg:
             return Severity::Error;
         case QtInfoMsg:
+        default:
             return Severity::MaybeWarning;
         }
     }
diff --git a/tests/auto/qml/codemodel/check/tst_check.cpp b/tests/auto/qml/codemodel/check/tst_check.cpp
index ad5a9765014..0c3ba465fc6 100644
--- a/tests/auto/qml/codemodel/check/tst_check.cpp
+++ b/tests/auto/qml/codemodel/check/tst_check.cpp
@@ -39,6 +39,7 @@
 #include <qmljs/qmljsmodelmanagerinterface.h>
 #include <qmljs/parser/qmljsast_p.h>
 #include <qmljs/parser/qmljsengine_p.h>
+#include <qmljs/parser/qmljssourcelocation_p.h>
 
 #include <QtTest>
 #include <algorithm>