Revert "Revert "Merge remote-tracking branch 'origin/4.15'""

This reverts commit f0a86d4510.

Reverting a merge doesn't "undo" it - the changes would be lost
forever even with subsequent merges.
So we need to revert the revert to get the changes.

Change-Id: I65928f876f4dc886561bed17c4b2aa42b388c1e3
Reviewed-by: Marco Bubke <marco.bubke@qt.io>

src/libs/qmljs/qmljscheck.h

@@ -122,6 +122,9 @@ private:
     bool isQtQuick2() const;
     bool isQtQuick2Ui() const;
 
+    bool isCaseOrDefault(AST::Node *n);
+    bool hasVarStatement(AST::Block *b) const;
+
     AST::Node *parent(int distance = 0);
 
     Document::Ptr _doc;