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

src/libs/qmljs/parser/qmljsast_p.h

@@ -223,7 +223,7 @@ public:
     static void accept(Node *node, Visitor *visitor);
 
     inline static void acceptChild(Node *node, Visitor *visitor)
-    { return accept(node, visitor); } // ### remove
+    { accept(node, visitor); } // ### remove
 
     virtual void accept0(Visitor *visitor) = 0;
     virtual SourceLocation firstSourceLocation() const = 0;

src/libs/qmljs/qmljscheck.cpp

@@ -124,7 +124,7 @@ public:
                             fileName.prepend(QLatin1Char('/'));
                             fileName.prepend(_doc->path());
                         }
-                        if (!QFileInfo(fileName).exists())
+                        if (!QFileInfo::exists(fileName))
                             setMessage(WarnFileOrDirectoryDoesNotExist);
                     }
                 }
@@ -556,8 +556,7 @@ public:
                                                       "Scale",
                                                       "Translate",
                                                       "Package",
-                                                      "Particles",
-                                                      "Dialog"})
+                                                      "Particles"})
     {
 
     }

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
 };
 }
 

src/libs/qmljs/qmljsdescribevalue.cpp

@@ -325,20 +325,18 @@ void DescribeValueVisitor::visit(const ObjectValue *value)
         basicDump("ObjectValue", value, printDetail);
     }
     if (printDetail) {
-        if (value) {
-            dumpNewline();
-            dump("className:");
-            dump(value->className());
-            dumpNewline();
-            dump("members:");
-            openContext("[");
-            PrintMembers printMembers(*this);
-            value->processMembers(&printMembers);
-            closeContext("]");
-            dumpNewline();
-            dump("prototype:");
-            (*this)(value->prototype());
-        }
+        dumpNewline();
+        dump("className:");
+        dump(value->className());
+        dumpNewline();
+        dump("members:");
+        openContext("[");
+        PrintMembers printMembers(*this);
+        value->processMembers(&printMembers);
+        closeContext("]");
+        dumpNewline();
+        dump("prototype:");
+        (*this)(value->prototype());
         closeContext();
     }
     --m_depth;

src/libs/qmljs/qmljslink.cpp

@@ -453,8 +453,9 @@ bool LinkPrivate::importLibrary(Document::Ptr doc,
                 }
             }
             if (errorLoc.isValid()) {
-                warning(doc, errorLoc,
-                        Link::tr("QML module contains C++ plugins, currently reading type information..."));
+                appendDiagnostic(doc, DiagnosticMessage(Severity::ReadingTypeInfoWarning,
+                                                        errorLoc,
+                                                        Link::tr("QML module contains C++ plugins, currently reading type information...")));
                 import->valid = false;
             }
         } else if (libraryInfo.pluginTypeInfoStatus() == LibraryInfo::DumpError

src/libs/qmljs/qmljsmodelmanagerinterface.cpp

@@ -782,7 +782,8 @@ static bool findNewQmlLibraryInPath(const QString &path,
     }
 
     // found a new library!
-    qmldirFile.open(QFile::ReadOnly);
+    if (!qmldirFile.open(QFile::ReadOnly))
+        return false;
     QString qmldirData = QString::fromUtf8(qmldirFile.readAll());
 
     QmlDirParser qmldirParser;

src/libs/qmljs/qmljsreformatter.cpp

@@ -150,8 +150,12 @@ protected:
     void outCommentText(const QString &str)
     {
         QStringList lines = str.split(QLatin1Char('\n'));
+        bool multiline = lines.length() > 1;
         for (int i = 0; i < lines.size(); ++i) {
-            _line = lines.at(i);  // multiline comments don't keep track of previos lines
+            if (multiline)
+                _line = lines.at(i);  // multiline comments don't keep track of previos lines
+            else
+                _line += lines.at(i);
             if (i != lines.size() - 1)
                 newLine();
         }
@@ -582,7 +586,7 @@ protected:
                 out(ast->identifierToken);
             }
         } else { // signal
-            out("signal ");
+            out("signal ", ast->identifierToken);
             out(ast->identifierToken);
             if (ast->parameters) {
                 out("(");

src/libs/qmljs/qmljstypedescriptionreader.cpp

@@ -641,7 +641,9 @@ void TypeDescriptionReader::readMetaObjectRevisions(UiScriptBinding *ast, FakeMe
 
 void TypeDescriptionReader::readEnumValues(AST::UiScriptBinding *ast, LanguageUtils::FakeMetaEnum *fme)
 {
-    if (!ast || !ast->statement) {
+    if (!ast)
+        return;
+    if (!ast->statement) {
         addError(ast->colonToken, tr("Expected object literal after colon."));
         return;
     }