Merge remote-tracking branch 'origin/4.3'

 Conflicts:
	src/plugins/genericprojectmanager/genericproject.cpp
	src/plugins/genericprojectmanager/genericproject.h
	src/plugins/genericprojectmanager/genericprojectnodes.cpp
	src/plugins/genericprojectmanager/genericprojectnodes.h

Change-Id: Ie0c870f68c8d200a75489b75860987655b2f6175

1 files changed, 6 insertions, 5 deletions

diff --git a/src/libs/qmljs/qmljsconstants.h b/src/libs/qmljs/qmljsconstants.h
index 532b74697d..9cbf9fb19b 100644
--- a/src/libs/qmljs/qmljsconstants.h
+++ b/src/libs/qmljs/qmljsconstants.h
@@ -56,11 +56,12 @@ enum Enum {
 namespace Severity {
 enum Enum
 {
-    Hint,         // cosmetic or convention
-    MaybeWarning, // possibly a warning, insufficient information
-    Warning,      // could cause unintended behavior
-    MaybeError,   // possibly an error, insufficient information
-    Error         // definitely an error
+    Hint,                   // cosmetic or convention
+    MaybeWarning,           // possibly a warning, insufficient information
+    Warning,                // could cause unintended behavior
+    ReadingTypeInfoWarning, // currently dumping type information
+    MaybeError,             // possibly an error, insufficient information
+    Error                   // definitely an error
 };
 }