Merge remote-tracking branch 'origin/4.0'

Change-Id: I80bc3371c6d7cf9f2d46cbcf8e79e4761213d8aa

src/libs/qmljs/qmljsreformatter.cpp

@@ -480,6 +480,13 @@ protected:
         }
     }
 
+    virtual bool visit(UiPragma *ast)
+    {
+        out("pragma ", ast->pragmaToken);
+        accept(ast->pragmaType);
+        return false;
+    }
+
     virtual bool visit(UiImport *ast)
     {
         out("import ", ast->importToken);
@@ -1187,6 +1194,12 @@ protected:
         return false;
     }
 
+    virtual bool visit(UiQualifiedPragmaId *ast)
+    {
+        out(ast->identifierToken);
+        return false;
+    }
+
     virtual bool visit(Elision *ast)
     {
         for (Elision *it = ast; it; it = it->next) {