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

This reverts commit 888ca0dd20.

Reason for revert: wrong patchset

Change-Id: I1291789938601aaf606c59917ff938e3c24c78dd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

src/libs/qmljs/qmljscheck.h

@@ -122,9 +122,6 @@ 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;