aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2020-03-03 19:05:08 +0200
committerOrgad Shaneh <orgads@gmail.com>2020-03-03 17:28:52 +0000
commite4dab6b83e607ecdac417e214e914a2cba8d0f16 (patch)
tree077f3d253f59807e4e098f344bd13d75af245d03
parent989eb36012f284f676451ee92dd6cd7e1cf0001f (diff)
QmlJS: Fix compiler warning and add a missing include
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>
-rw-r--r--src/libs/qmljs/parser/qmljsdiagnosticmessage_p.h1
-rw-r--r--tests/auto/qml/codemodel/check/tst_check.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/libs/qmljs/parser/qmljsdiagnosticmessage_p.h b/src/libs/qmljs/parser/qmljsdiagnosticmessage_p.h
index 1e6e86971c..a29d29e642 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 ad5a976501..0c3ba465fc 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>